@iconify/tools 2.0.17 → 2.1.0-beta.2

package/lib/icon-set/index.cjs

@@ -2,17 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const icon = require('@iconify/utils/lib/icon');
+const defaults = require('@iconify/utils/lib/icon/defaults');
 const build = require('@iconify/utils/lib/svg/build');
-const customisations = require('@iconify/utils/lib/customisations');
+const defaults$1 = require('@iconify/utils/lib/customisations/defaults');
 const minify = require('@iconify/utils/lib/icon-set/minify');
 const convertInfo = require('@iconify/utils/lib/icon-set/convert-info');
 const iconSet_props = require('./props.cjs');
 const svg_index = require('../svg/index.cjs');
+const utils = require('@iconify/utils');
+require('@iconify/utils/lib/misc/objects');
 require('cheerio');
-require('@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);
@@ -23,7 +23,7 @@ class IconSet {
   }
   load(data) {
     this.prefix = data.prefix;
-    const defaultProps = iconSet_props.filterProps(data, true);
+    const defaultProps = iconSet_props.filterProps(data, defaults.defaultIconDimensions, true);
     this.entries = /* @__PURE__ */ Object.create(null);
     const entries = this.entries;
     for (const name in data.icons) {
@@ -34,7 +34,7 @@ class IconSet {
         props: iconSet_props.filterProps({
           ...defaultProps,
           ...item
-        }, true),
+        }, iconSet_props.defaultCommonProps, true),
         chars: /* @__PURE__ */ new Set(),
         categories: /* @__PURE__ */ new Set()
       };
@@ -42,9 +42,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 = iconSet_props.filterProps(item, false);
+        const props = iconSet_props.filterProps(item, iconSet_props.defaultCommonProps, false);
         const chars = /* @__PURE__ */ new Set();
         if (Object.keys(props).length) {
           const entry = {
@@ -121,6 +124,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) => {
@@ -144,60 +151,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 ? icon.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 = utils.mergeIconData(item2.props, result);
+      if (item2.type === "icon") {
+        result.body = item2.body;
+      }
+    }
+    parse(name);
+    tree.forEach(parse);
+    return result && full ? { ...defaults.defaultIconProps, ...result } : result;
+  }
+  toString(name, customisations = {
     width: "auto",
     height: "auto"
   }) {
@@ -206,8 +206,8 @@ class IconSet {
       return null;
     }
     const result = build.iconToSVG(item, {
-      ...customisations.defaults,
-      ...custommisations
+      ...defaults$1.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>`;
@@ -219,6 +219,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) => {
@@ -234,7 +235,7 @@ class IconSet {
         }
         case "alias":
         case "variation": {
-          if (validate && !this.resolve(name)) {
+          if (validate && !tree[name]) {
             break;
           }
           const props = item.type === "variation" ? item.props : {};
@@ -258,6 +259,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;
@@ -341,7 +345,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;
@@ -357,7 +361,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;
     }
@@ -380,51 +384,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;
@@ -451,6 +449,7 @@ class IconSet {
           break;
       }
     }
+    this.updateLastModified();
     return true;
   }
   setItem(name, item) {
@@ -463,13 +462,14 @@ class IconSet {
       }
     }
     this.entries[name] = item;
+    this.updateLastModified();
     return true;
   }
   setIcon(name, icon) {
     return this.setItem(name, {
       type: "icon",
       body: icon.body,
-      props: iconSet_props.filterProps(icon, true),
+      props: iconSet_props.filterProps(icon, iconSet_props.defaultCommonProps, true),
       chars: /* @__PURE__ */ new Set(),
       categories: /* @__PURE__ */ new Set()
     });
@@ -490,18 +490,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 iconSet_props.extraDefaultProps) {
-          const prop = key;
-          if (item.props[prop]) {
-            props[prop] = item.props[prop];
-          }
-        }
         return this.setItem(name, {
           type: "icon",
           body,
@@ -529,7 +523,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

@@ -1,7 +1,8 @@
-import { IconifyInfo, IconifyJSON } from '@iconify/types';
-import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations';
+import { a as IconifyInfo, b as IconifyJSON } from '../types-f0980297.js';
+import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 import { IconSetIconEntry, IconCategory, IconSetIconType, IconSetAsyncForEachCallback, ResolvedIconifyIcon, CommonIconProps, CheckThemeResult } from './types.js';
 import { SVG } from '../svg/index.js';
+import { ParentIconsTree } from '@iconify/utils/lib/icon-set/tree';
 
 /**
  * Sort theme keys: long keys first
@@ -18,6 +19,7 @@ declare class IconSet {
      * 'entries' and 'categories' properties, there are functions for that.
      */
     prefix: string;
+    lastModified: number;
     entries: Record<string, IconSetIconEntry>;
     info: IconifyInfo | undefined;
     categories: Set<IconCategory>;
@@ -31,6 +33,10 @@ declare class IconSet {
      * Load icon set
      */
     load(data: IconifyJSON): void;
+    /**
+     * Update last modification time
+     */
+    updateLastModified(value?: number): void;
     /**
      * List icons
      */
@@ -42,6 +48,18 @@ declare class IconSet {
      * Callback should return false to stop loop.
      */
     forEach(callback: IconSetAsyncForEachCallback, types?: IconSetIconType[]): Promise<void>;
+    /**
+     * Get parent icons tree
+     *
+     * Returns parent icons list for each icon, null if failed to resolve.
+     * In parent icons list, first element is a direct parent, last is icon. Does not include item.
+     *
+     * Examples:
+     *   'alias3': ['alias2', 'alias1', 'icon']
+     * 	 'icon': []
+     * 	 'bad-icon': null
+     */
+    getTree(names?: string[]): ParentIconsTree;
     /**
      * Resolve icon
      */
@@ -51,7 +69,7 @@ declare class IconSet {
     /**
      * Generate HTML
      */
-    toString(name: string, custommisations?: IconifyIconCustomisations): string | null;
+    toString(name: string, customisations?: IconifyIconCustomisations): string | null;
     /**
      * Get SVG instance for icon
      */
@@ -75,7 +93,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
      *
@@ -89,7 +107,7 @@ declare class IconSet {
     /**
      * Remove icons. Returns number of removed icons
      *
-     * If removeDependencies is a string, it represents new parent for all aliases of removed icon.
+     * If removeDependencies is a string, it represents new parent for all aliases of removed icon. New parent cannot be alias or variation.
      */
     remove(name: string, removeDependencies?: boolean | string): number;
     /**