@iconify/tools 2.0.17 → 2.1.0-beta.2

package/lib/icon-set/index.mjs

@@ -1,14 +1,14 @@
-import { fullIcon } from '@iconify/utils/lib/icon';
+import { defaultIconDimensions, defaultIconProps } from '@iconify/utils/lib/icon/defaults';
 import { iconToSVG } from '@iconify/utils/lib/svg/build';
-import { defaults } from '@iconify/utils/lib/customisations';
+import { defaultIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 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 { filterProps, defaultCommonProps } from './props.mjs';
 import { SVG } from '../svg/index.mjs';
+import { mergeIconData } from '@iconify/utils';
+import '@iconify/utils/lib/misc/objects';
 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);
@@ -19,7 +19,7 @@ class IconSet {
   }
   load(data) {
     this.prefix = data.prefix;
-    const defaultProps = filterProps(data, true);
+    const defaultProps = filterProps(data, defaultIconDimensions, true);
     this.entries = /* @__PURE__ */ Object.create(null);
     const entries = this.entries;
     for (const name in data.icons) {
@@ -30,7 +30,7 @@ class IconSet {
         props: filterProps({
           ...defaultProps,
           ...item
-        }, true),
+        }, defaultCommonProps, true),
         chars: /* @__PURE__ */ new Set(),
         categories: /* @__PURE__ */ new Set()
       };
@@ -38,9 +38,12 @@ 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);
+        const props = filterProps(item, defaultCommonProps, false);
         const chars = /* @__PURE__ */ new Set();
         if (Object.keys(props).length) {
           const entry = {
@@ -117,6 +120,10 @@ class IconSet {
         }
       }
     });
+    this.lastModified = data.lastModified || 0;
+  }
+  updateLastModified(value) {
+    this.lastModified = value || Math.floor(Date.now() / 1e3);
   }
   list(types = ["icon", "variation"]) {
     return Object.keys(this.entries).filter((name) => {
@@ -140,60 +147,53 @@ class IconSet {
       }
     }
   }
-  resolve(name, full = false) {
+  getTree(names) {
     const entries = this.entries;
-    function getIcon(name2, iteration) {
-      if (entries[name2] === void 0 || iteration > maxIteration) {
-        return null;
+    const resolved = /* @__PURE__ */ Object.create(null);
+    function resolve(name) {
+      const item = entries[name];
+      if (!item) {
+        return resolved[name] = null;
       }
-      const item = entries[name2];
-      switch (item.type) {
-        case "icon": {
-          const result2 = {
-            body: item.body,
-            ...item.props
-          };
-          return result2;
-        }
-        case "alias":
-          return getIcon(item.parent, iteration + 1);
-        case "variation": {
-          const parent = getIcon(item.parent, iteration + 1);
-          if (!parent) {
-            return null;
-          }
-          for (const key in item.props) {
-            const attr = key;
-            const value = item.props[attr];
-            if (value) {
-              if (parent[attr] === void 0) {
-                parent[attr] = value;
-              } else {
-                switch (attr) {
-                  case "rotate":
-                    parent[attr] = (parent[attr] + value) % 4;
-                    break;
-                  case "hFlip":
-                  case "vFlip":
-                    parent[attr] = !parent[attr];
-                    break;
-                  default:
-                    parent[attr] = value;
-                    break;
-                }
-              }
-            }
-          }
-          return parent;
+      if (item.type === "icon") {
+        return resolved[name] = [];
+      }
+      if (resolved[name] === void 0) {
+        resolved[name] = null;
+        const parent = item.parent;
+        const value = parent && resolve(parent);
+        if (value) {
+          resolved[name] = [parent].concat(value);
         }
-        default:
-          return null;
       }
+      return resolved[name];
     }
-    const result = getIcon(name, 0);
-    return result && full ? fullIcon(result) : result;
+    (names || Object.keys(entries)).forEach(resolve);
+    return resolved;
   }
-  toString(name, custommisations = {
+  resolve(name, full = false) {
+    const entries = this.entries;
+    const item = entries[name];
+    const tree = item && (item.type === "icon" ? [] : this.getTree([name])[name]);
+    if (!tree) {
+      return null;
+    }
+    let result = {};
+    function parse(name2) {
+      const item2 = entries[name2];
+      if (item2.type === "alias") {
+        return;
+      }
+      result = mergeIconData(item2.props, result);
+      if (item2.type === "icon") {
+        result.body = item2.body;
+      }
+    }
+    parse(name);
+    tree.forEach(parse);
+    return result && full ? { ...defaultIconProps, ...result } : result;
+  }
+  toString(name, customisations = {
     width: "auto",
     height: "auto"
   }) {
@@ -202,8 +202,8 @@ class IconSet {
       return null;
     }
     const result = iconToSVG(item, {
-      ...defaults,
-      ...custommisations
+      ...defaultIconCustomisations,
+      ...customisations
     });
     const attributes = Object.keys(result.attributes).map((key) => ` ${key}="${result.attributes[key]}"`).join("");
     return `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"${attributes}>${result.body}</svg>`;
@@ -215,6 +215,7 @@ class IconSet {
   export(validate = true) {
     const icons = /* @__PURE__ */ Object.create(null);
     const aliases = /* @__PURE__ */ Object.create(null);
+    const tree = validate ? this.getTree() : /* @__PURE__ */ Object.create(null);
     const names = Object.keys(this.entries);
     names.sort((a, b) => a.localeCompare(b));
     names.forEach((name) => {
@@ -230,7 +231,7 @@ class IconSet {
         }
         case "alias":
         case "variation": {
-          if (validate && !this.resolve(name)) {
+          if (validate && !tree[name]) {
             break;
           }
           const props = item.type === "variation" ? item.props : {};
@@ -254,6 +255,9 @@ class IconSet {
     if (info) {
       result.info = info;
     }
+    if (this.lastModified) {
+      result.lastModified = this.lastModified;
+    }
     result.icons = icons;
     if (Object.keys(aliases).length) {
       result.aliases = aliases;
@@ -337,7 +341,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;
@@ -353,7 +357,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;
     }
@@ -376,51 +380,45 @@ class IconSet {
   }
   remove(name, removeDependencies = true) {
     const entries = this.entries;
-    const names = /* @__PURE__ */ new Set();
     if (typeof removeDependencies === "string") {
-      if (name === removeDependencies || !entries[removeDependencies]) {
+      const item2 = entries[removeDependencies];
+      if (name === removeDependencies || item2?.type !== "icon") {
         return 0;
       }
-      names.add(removeDependencies);
     }
-    function del(name2, iteration) {
-      if (entries[name2] === void 0 || iteration > maxIteration || names.has(name2)) {
-        return false;
-      }
-      names.add(name2);
-      if (removeDependencies === true || !iteration && typeof removeDependencies === "string") {
-        for (const key in entries) {
-          const item = entries[key];
-          switch (item.type) {
-            case "icon":
-              break;
-            case "alias":
-            case "variation":
-              if (item.parent === name2) {
-                if (removeDependencies === true) {
-                  if (!del(key, iteration + 1)) {
-                    return false;
-                  }
-                  break;
-                }
-                item.parent = removeDependencies;
-              }
-              break;
-          }
-        }
-      }
-      return true;
+    const item = entries[name];
+    if (!item) {
+      return 0;
     }
-    if (del(name, 0)) {
-      if (typeof removeDependencies === "string") {
-        names.delete(removeDependencies);
+    this.updateLastModified();
+    if (typeof removeDependencies === "string") {
+      for (const key in entries) {
+        const item2 = entries[key];
+        if (item2.type !== "icon" && item2.parent === name) {
+          item2.parent = removeDependencies;
+        }
       }
-      names.forEach((name2) => {
-        delete entries[name2];
+      return 0;
+    }
+    delete entries[name];
+    let count = 1;
+    function remove(parent) {
+      const list = Object.keys(entries).filter((name2) => {
+        const item2 = entries[name2];
+        return item2.type !== "icon" && item2.parent === parent;
       });
-      return names.size;
+      list.forEach((name2) => {
+        if (entries[name2]) {
+          delete entries[name2];
+          count++;
+          remove(name2);
+        }
+      });
+    }
+    if (removeDependencies === true) {
+      remove(name);
     }
-    return 0;
+    return count;
   }
   rename(oldName, newName) {
     const entries = this.entries;
@@ -447,6 +445,7 @@ class IconSet {
           break;
       }
     }
+    this.updateLastModified();
     return true;
   }
   setItem(name, item) {
@@ -459,13 +458,14 @@ class IconSet {
       }
     }
     this.entries[name] = item;
+    this.updateLastModified();
     return true;
   }
   setIcon(name, icon) {
     return this.setItem(name, {
       type: "icon",
       body: icon.body,
-      props: filterProps(icon, true),
+      props: filterProps(icon, defaultCommonProps, true),
       chars: /* @__PURE__ */ new Set(),
       categories: /* @__PURE__ */ new Set()
     });
@@ -486,18 +486,12 @@ class IconSet {
     });
   }
   fromSVG(name, svg) {
-    const props = svg.viewBox;
+    const props = { ...svg.viewBox };
     const body = svg.getBody();
     const item = this.entries[name];
     switch (item?.type) {
       case "icon":
       case "variation": {
-        for (const key in extraDefaultProps) {
-          const prop = key;
-          if (item.props[prop]) {
-            props[prop] = item.props[prop];
-          }
-        }
         return this.setItem(name, {
           type: "icon",
           body,
@@ -525,7 +519,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/match.cjs

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const icon = require('@iconify/utils/lib/icon');
+const defaults = require('@iconify/utils/lib/icon/defaults');
 
 const maxIteration = 5;
-function findMatchingIcon(iconSet, icon$1) {
-  const body = icon$1.body;
+function findMatchingIcon(iconSet, icon) {
+  const body = icon.body;
   let hiddenMatch = null;
   function isMatching(data) {
-    for (const key in icon.iconDefaults) {
+    for (const key in defaults.defaultIconProps) {
       const attr = key;
-      if (data[attr] !== icon$1[attr]) {
+      if (data[attr] !== icon[attr]) {
         return false;
       }
     }

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

@@ -1,9 +1,10 @@
-import { FullIconifyIcon } from '@iconify/utils/lib/icon';
+import { FullIconifyIcon } from '@iconify/utils/lib/icon/defaults';
 import { IconSet } from './index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import './types.js';
 import '../svg/index.js';
+import '@iconify/utils/lib/icon-set/tree';
 
 /**
  * Find matching icon in icon set

package/lib/icon-set/match.mjs

@@ -1,11 +1,11 @@
-import { iconDefaults } from '@iconify/utils/lib/icon';
+import { defaultIconProps } from '@iconify/utils/lib/icon/defaults';
 
 const maxIteration = 5;
 function findMatchingIcon(iconSet, icon) {
   const body = icon.body;
   let hiddenMatch = null;
   function isMatching(data) {
-    for (const key in iconDefaults) {
+    for (const key in defaultIconProps) {
       const attr = key;
       if (data[attr] !== icon[attr]) {
         return false;

package/lib/icon-set/merge.cjs

@@ -4,15 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const iconSet_index = require('./index.cjs');
 const iconSet_match = require('./match.cjs');
-require('@iconify/utils/lib/icon');
+const iconSet_modified = require('./modified.cjs');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/customisations/defaults');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('./props.cjs');
+require('@iconify/utils/lib/misc/objects');
+require('@iconify/utils');
 require('../svg/index.cjs');
 require('cheerio');
-require('@iconify/utils');
 
 function mergeIconSets(oldIcons, newIcons) {
   const mergedIcons = new iconSet_index.IconSet(newIcons.export());
@@ -77,6 +79,11 @@ function mergeIconSets(oldIcons, newIcons) {
   for (const name in oldEntries) {
     add(name);
   }
+  const lastModified1 = oldIcons.lastModified;
+  const lastModified2 = newIcons.lastModified;
+  if ((lastModified1 || lastModified2) && !iconSet_modified.hasIconDataBeenModified(oldIcons, newIcons)) {
+    mergedIcons.updateLastModified(lastModified2 ? lastModified1 ? Math.min(lastModified1, lastModified2) : lastModified2 : lastModified1);
+  }
   return mergedIcons;
 }
 

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

@@ -1,8 +1,9 @@
 import { IconSet } from './index.js';
-import '@iconify/types';
-import '@iconify/utils/lib/customisations';
+import '../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
 import './types.js';
 import '../svg/index.js';
+import '@iconify/utils/lib/icon-set/tree';
 
 /**
  * Merge icon sets

package/lib/icon-set/merge.mjs

@@ -1,14 +1,16 @@
 import { IconSet } from './index.mjs';
 import { findMatchingIcon } from './match.mjs';
-import '@iconify/utils/lib/icon';
+import { hasIconDataBeenModified } from './modified.mjs';
+import '@iconify/utils/lib/icon/defaults';
 import '@iconify/utils/lib/svg/build';
-import '@iconify/utils/lib/customisations';
+import '@iconify/utils/lib/customisations/defaults';
 import '@iconify/utils/lib/icon-set/minify';
 import '@iconify/utils/lib/icon-set/convert-info';
 import './props.mjs';
+import '@iconify/utils/lib/misc/objects';
+import '@iconify/utils';
 import '../svg/index.mjs';
 import 'cheerio';
-import '@iconify/utils';
 
 function mergeIconSets(oldIcons, newIcons) {
   const mergedIcons = new IconSet(newIcons.export());
@@ -73,6 +75,11 @@ function mergeIconSets(oldIcons, newIcons) {
   for (const name in oldEntries) {
     add(name);
   }
+  const lastModified1 = oldIcons.lastModified;
+  const lastModified2 = newIcons.lastModified;
+  if ((lastModified1 || lastModified2) && !hasIconDataBeenModified(oldIcons, newIcons)) {
+    mergedIcons.updateLastModified(lastModified2 ? lastModified1 ? Math.min(lastModified1, lastModified2) : lastModified2 : lastModified1);
+  }
   return mergedIcons;
 }
 

package/lib/icon-set/modified.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+function hasIconDataBeenModified(set1, set2) {
+  const entries1 = set1.entries;
+  const entries2 = set2.entries;
+  const keys1 = Object.keys(entries1);
+  const keys2 = Object.keys(entries2);
+  if (keys1.length !== keys2.length) {
+    return true;
+  }
+  for (let i = 0; i < keys1.length; i++) {
+    if (!entries2[keys1[i]]) {
+      return true;
+    }
+  }
+  for (let i = 0; i < keys1.length; i++) {
+    const name = keys1[i];
+    if (set1.toString(name) !== set2.toString(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+exports.hasIconDataBeenModified = hasIconDataBeenModified;

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

@@ -0,0 +1,15 @@
+import { IconSet } from './index.js';
+import '../types-f0980297.js';
+import '@iconify/utils/lib/customisations/defaults';
+import './types.js';
+import '../svg/index.js';
+import '@iconify/utils/lib/icon-set/tree';
+
+/**
+ * Check if icons in an icon set were updated.
+ *
+ * This function checks only icons, not metadata. It also ignores icon visibility.
+ */
+declare function hasIconDataBeenModified(set1: IconSet, set2: IconSet): boolean;
+
+export { hasIconDataBeenModified };

package/lib/icon-set/modified.mjs

@@ -0,0 +1,23 @@
+function hasIconDataBeenModified(set1, set2) {
+  const entries1 = set1.entries;
+  const entries2 = set2.entries;
+  const keys1 = Object.keys(entries1);
+  const keys2 = Object.keys(entries2);
+  if (keys1.length !== keys2.length) {
+    return true;
+  }
+  for (let i = 0; i < keys1.length; i++) {
+    if (!entries2[keys1[i]]) {
+      return true;
+    }
+  }
+  for (let i = 0; i < keys1.length; i++) {
+    const name = keys1[i];
+    if (set1.toString(name) !== set2.toString(name)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+export { hasIconDataBeenModified };

package/lib/icon-set/props.cjs

@@ -2,27 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const icon = require('@iconify/utils/lib/icon');
+const objects = require('@iconify/utils/lib/misc/objects');
+const utils = require('@iconify/utils');
 
-const extraDefaultProps = {
+const defaultCommonProps = Object.freeze({
+  ...utils.defaultIconProps,
   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;
+});
+function filterProps(data, reference, compareDefaultValues) {
+  const result = objects.commonObjectProps(data, reference);
+  return compareDefaultValues ? objects.unmergeObjects(result, reference) : result;
 }
 
 exports.defaultCommonProps = defaultCommonProps;
-exports.extraDefaultProps = extraDefaultProps;
 exports.filterProps = filterProps;

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

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

package/lib/icon-set/props.mjs

@@ -1,22 +1,13 @@
-import { iconDefaults } from '@iconify/utils/lib/icon';
+import { commonObjectProps, unmergeObjects } from '@iconify/utils/lib/misc/objects';
+import { defaultIconProps } from '@iconify/utils';
 
-const extraDefaultProps = {
+const defaultCommonProps = Object.freeze({
+  ...defaultIconProps,
   hidden: false
-};
-const defaultCommonProps = {
-  ...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;
+});
+function filterProps(data, reference, compareDefaultValues) {
+  const result = commonObjectProps(data, reference);
+  return compareDefaultValues ? unmergeObjects(result, reference) : result;
 }
 
-export { defaultCommonProps, extraDefaultProps, filterProps };
+export { defaultCommonProps, filterProps };

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

@@ -1,4 +1,4 @@
-import { ExtendedIconifyIcon, ExtendedIconifyAlias, IconifyOptional, IconifyIcon } from '@iconify/types';
+import { E as ExtendedIconifyIcon, c as ExtendedIconifyAlias, d as IconifyOptional, I as IconifyIcon } from '../types-f0980297.js';
 
 /**
  * Category item

package/lib/import/directory.cjs

@@ -8,14 +8,15 @@ const misc_keyword = require('../misc/keyword.cjs');
 const misc_scan = require('../misc/scan.cjs');
 const svg_index = require('../svg/index.cjs');
 const svg_cleanup = require('../svg/cleanup.cjs');
-require('@iconify/utils/lib/icon');
+require('@iconify/utils/lib/icon/defaults');
 require('@iconify/utils/lib/svg/build');
-require('@iconify/utils/lib/customisations');
+require('@iconify/utils/lib/customisations/defaults');
 require('@iconify/utils/lib/icon-set/minify');
 require('@iconify/utils/lib/icon-set/convert-info');
 require('../icon-set/props.cjs');
-require('cheerio');
+require('@iconify/utils/lib/misc/objects');
 require('@iconify/utils');
+require('cheerio');
 require('../svg/cleanup/attribs.cjs');
 require('../svg/data/attributes.cjs');
 require('../svg/data/tags.cjs');