@iconify/tools 2.0.11 → 2.0.14

package/lib/colors/parse.d.ts

@@ -1,7 +1,7 @@
 import type { Color } from '@iconify/utils/lib/colors/types';
 import type { SVG } from '../svg';
-import { ParseSVGCallbackItem } from '../svg/parse';
 import { ColorAttributes } from './attribs';
+import type { AnalyseSVGStructureResult, ElementsTreeItem, ExtendedTagElement, AnalyseSVGStructureOptions } from '../svg/analyse/types';
 /**
  * Result
  */
@@ -20,24 +20,31 @@ export interface FindColorsResult {
  * - 'remove' to remove shape or rule
  */
 declare type ParseColorsCallbackResult = Color | string | 'remove' | 'unset';
-declare type ParseColorsCallback = (attr: ColorAttributes, colorString: string, parsedColor: Color | null, tagName?: string) => ParseColorsCallbackResult | Promise<ParseColorsCallbackResult>;
+declare type ParseColorsCallback = (attr: ColorAttributes, colorString: string, parsedColor: Color | null, tagName?: string, item?: ExtendedTagElementWithColors) => ParseColorsCallbackResult | Promise<ParseColorsCallbackResult>;
+/**
+ * Callback for default color
+ */
+export declare type ParseColorOptionsDefaultColorCallback = (prop: string, item: ExtendedTagElementWithColors, treeItem: ElementsTreeItem, iconData: AnalyseSVGStructureResult) => Color;
 /**
  * Options
  */
-export declare type ParseColorOptionsDefaultColorCallback = (prop: string, item: ExtendedParseSVGCallbackItem) => Color;
-export interface ParseColorsOptions {
+export interface ParseColorsOptions extends AnalyseSVGStructureOptions {
     callback?: ParseColorsCallback;
     defaultColor?: Color | string | ParseColorOptionsDefaultColorCallback;
 }
 /**
- * Extend properties for item
+ * Extend properties for element
  */
 declare type ItemColors = Partial<Record<ColorAttributes, Color | string>>;
-export interface ExtendedParseSVGCallbackItem extends ParseSVGCallbackItem {
-    colors?: ItemColors;
+export interface ExtendedTagElementWithColors extends ExtendedTagElement {
+    _colors?: ItemColors;
+    _removed?: boolean;
 }
 /**
  * Find colors in icon
+ *
+ * Clean up icon before running this function to convert style to attributes using
+ * cleanupInlineStyle() or cleanupSVG(), otherwise results might be inaccurate
  */
 export declare function parseColors(svg: SVG, options?: ParseColorsOptions): Promise<FindColorsResult>;
 /**

package/lib/colors/parse.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEmptyColor = exports.parseColors = void 0;
 const colors_1 = require("@iconify/utils/lib/colors");
-const parse_1 = require("../svg/parse");
 const tags_1 = require("../svg/data/tags");
 const parse_style_1 = require("../svg/parse-style");
 const attribs_1 = require("./attribs");
 const attributes_1 = require("../svg/data/attributes");
+const analyse_1 = require("../svg/analyse");
 /**
  * Properties to check
  */
@@ -14,6 +14,9 @@ const propsToCheck = Object.keys(attribs_1.defaultColorValues);
 const animatePropsToCheck = ['from', 'to', 'values'];
 /**
  * Find colors in icon
+ *
+ * Clean up icon before running this function to convert style to attributes using
+ * cleanupInlineStyle() or cleanupSVG(), otherwise results might be inaccurate
  */
 async function parseColors(svg, options = {}) {
     const result = {
@@ -25,6 +28,9 @@ async function parseColors(svg, options = {}) {
     const defaultColor = typeof options.defaultColor === 'string'
         ? (0, colors_1.stringToColor)(options.defaultColor)
         : options.defaultColor;
+    /**
+     * Find matching color in results
+     */
     function findColor(color, add = false) {
         const isString = typeof color === 'string';
         for (let i = 0; i < result.colors.length; i++) {
@@ -47,29 +53,31 @@ async function parseColors(svg, options = {}) {
     /**
      * Add color to item and to results
      */
-    function addColorToItem(prop, color, item) {
-        const addedColor = findColor(color, true);
+    function addColorToItem(prop, color, item, add = true) {
+        const addedColor = findColor(color, add !== false);
         if (item) {
-            const itemColors = item.colors || {};
-            if (!item.colors) {
-                item.colors = itemColors;
-            }
-            itemColors[prop] = addedColor;
+            const itemColors = item._colors || (item._colors = {});
+            itemColors[prop] = addedColor === null ? color : addedColor;
         }
     }
     /**
      * Get element color
      */
-    function getElementColor(prop, item) {
+    function getElementColor(prop, item, elements) {
         function find(prop) {
             var _a;
             let currentItem = item;
             while (currentItem) {
-                const color = (_a = currentItem.colors) === null || _a === void 0 ? void 0 : _a[prop];
+                const element = elements.get(currentItem.index);
+                const color = (_a = element._colors) === null || _a === void 0 ? void 0 : _a[prop];
                 if (color !== void 0) {
                     return color;
                 }
-                currentItem = currentItem.parents[0];
+                currentItem = currentItem.parent;
+                if (currentItem === null || currentItem === void 0 ? void 0 : currentItem.usedAsMask) {
+                    // Used as mask: color from parent item is irrelevant
+                    return attribs_1.defaultColorValues[prop];
+                }
             }
             return attribs_1.defaultColorValues[prop];
         }
@@ -97,6 +105,8 @@ async function parseColors(svg, options = {}) {
         const defaultValue = parsedColor || value;
         // Ignore url()
         if ((parsedColor === null || parsedColor === void 0 ? void 0 : parsedColor.type) === 'function' && parsedColor.func === 'url') {
+            // Add to item, so it won't be treated as missing, but do not add to results
+            addColorToItem(prop, defaultValue, item, false);
             return value;
         }
         // Check if callback exists
@@ -105,7 +115,7 @@ async function parseColors(svg, options = {}) {
             return value;
         }
         // Call callback
-        let callbackResult = options.callback(prop, value, parsedColor, item === null || item === void 0 ? void 0 : item.tagName);
+        let callbackResult = options.callback(prop, value, parsedColor, item === null || item === void 0 ? void 0 : item.tagName, item);
         callbackResult =
             callbackResult instanceof Promise
                 ? await callbackResult
@@ -113,11 +123,7 @@ async function parseColors(svg, options = {}) {
         // Remove entry
         switch (callbackResult) {
             case 'remove': {
-                if (item) {
-                    item.$element.remove();
-                    item.testChildren = false;
-                }
-                return;
+                return item ? callbackResult : void 0;
             }
             case 'unset':
                 return;
@@ -156,19 +162,58 @@ async function parseColors(svg, options = {}) {
             result.hasGlobalStyle = true;
         }
         return newValue;
-    }, {
-        skipMasks: true,
     });
-    // Parse colors in SVG
-    await (0, parse_1.parseSVG)(svg, async (item) => {
-        const tagName = item.tagName;
-        if (tags_1.maskAndSymbolTags.has(tagName)) {
-            // Ignore masks
-            item.testChildren = false;
+    // Analyse SVG
+    const iconData = await (0, analyse_1.analyseSVGStructure)(svg, options);
+    const { elements, tree } = iconData;
+    const cheerio = svg.$svg;
+    const removedElements = new Set();
+    const parsedElements = new Set();
+    // Remove element
+    function removeElement(index, element) {
+        // Mark all children as removed (direct children as in DOM)
+        function removeChildren(element) {
+            element.children.forEach((item) => {
+                if (item.type !== 'tag') {
+                    return;
+                }
+                const element = item;
+                const index = element._index;
+                if (index && !removedElements.has(index)) {
+                    element._removed = true;
+                    removedElements.add(index);
+                    removeChildren(element);
+                }
+            });
+        }
+        // Remove element
+        element._removed = true;
+        removedElements.add(index);
+        removeChildren(element);
+        cheerio(element).remove();
+    }
+    // Parse tree item
+    async function parseTreeItem(item) {
+        const index = item.index;
+        if (removedElements.has(index) || parsedElements.has(index)) {
             return;
         }
-        const $element = item.$element;
-        const attribs = item.element.attribs;
+        parsedElements.add(index);
+        const element = elements.get(index);
+        if (element._removed) {
+            return;
+        }
+        const { tagName, attribs } = element;
+        // Copy colors from parent item
+        if (item.parent) {
+            const parentIndex = item.parent.index;
+            const parentElement = elements.get(parentIndex);
+            if (parentElement._colors) {
+                element._colors = {
+                    ...parentElement._colors,
+                };
+            }
+        }
         // Check common properties
         for (let i = 0; i < propsToCheck.length; i++) {
             const prop = propsToCheck[i];
@@ -178,13 +223,24 @@ async function parseColors(svg, options = {}) {
             }
             const value = attribs[prop];
             if (value !== void 0) {
-                const newValue = await checkColor(prop, value, item);
+                const newValue = await checkColor(prop, value, element);
                 if (newValue !== value) {
                     if (newValue === void 0) {
-                        $element.removeAttr(prop);
+                        // Unset
+                        cheerio(element).removeAttr(prop);
+                        if (element._colors) {
+                            delete element._colors[prop];
+                        }
+                    }
+                    else if (newValue === 'remove') {
+                        // Remove element
+                        removeElement(index, element);
+                        return;
                     }
                     else {
-                        $element.attr(prop, newValue);
+                        // Change attribute
+                        // Value in element._colors is changed in checkColor()
+                        cheerio(element).attr(prop, newValue);
                     }
                 }
             }
@@ -220,7 +276,7 @@ async function parseColors(svg, options = {}) {
                     }
                     // Merge values back
                     if (updatedValues) {
-                        $element.attr(elementProp, splitValues.join(';'));
+                        cheerio(element).attr(elementProp, splitValues.join(';'));
                     }
                 }
             }
@@ -240,22 +296,19 @@ async function parseColors(svg, options = {}) {
             });
             // Check colors
             if (requiredProps) {
-                const itemColors = item.colors || {};
-                if (!item.colors) {
-                    item.colors = itemColors;
-                }
+                const itemColors = element._colors || (element._colors = {});
                 for (let i = 0; i < requiredProps.length; i++) {
                     const prop = requiredProps[i];
-                    const color = getElementColor(prop, item);
+                    const color = getElementColor(prop, item, elements);
                     if (color === attribs_1.defaultBlackColor) {
                         // Default black color: change it
                         if (defaultColor) {
                             const defaultColorValue = typeof defaultColor === 'function'
-                                ? defaultColor(prop, item)
+                                ? defaultColor(prop, element, item, iconData)
                                 : defaultColor;
                             // Add color to results and change attribute
                             findColor(defaultColorValue, true);
-                            $element.attr(prop, (0, colors_1.colorToString)(defaultColorValue));
+                            cheerio(element).attr(prop, (0, colors_1.colorToString)(defaultColorValue));
                             itemColors[prop] = defaultColorValue;
                         }
                         else {
@@ -265,7 +318,16 @@ async function parseColors(svg, options = {}) {
                 }
             }
         }
-    });
+        // Parse child elements
+        for (let i = 0; i < item.children.length; i++) {
+            const childItem = item.children[i];
+            if (!childItem.usedAsMask) {
+                await parseTreeItem(childItem);
+            }
+        }
+    }
+    // Parse tree, starting with <svg>
+    await parseTreeItem(tree);
     return result;
 }
 exports.parseColors = parseColors;

package/lib/colors/parse.mjs

@@ -4,8 +4,7 @@ import {
   stringToColor,
   colorToString
 } from "@iconify/utils/lib/colors";
-import { parseSVG } from "../svg/parse.mjs";
-import { animateTags, maskAndSymbolTags, shapeTags } from "../svg/data/tags.mjs";
+import { animateTags, shapeTags } from "../svg/data/tags.mjs";
 import { parseSVGStyle } from "../svg/parse-style.mjs";
 import {
   defaultBlackColor,
@@ -14,6 +13,7 @@ import {
   specialColorAttributes
 } from "./attribs.mjs";
 import { tagSpecificPresentationalAttributes } from "../svg/data/attributes.mjs";
+import { analyseSVGStructure } from "../svg/analyse.mjs";
 var propsToCheck = Object.keys(defaultColorValues);
 var animatePropsToCheck = ["from", "to", "values"];
 async function parseColors(svg, options = {}) {
@@ -40,26 +40,27 @@ async function parseColors(svg, options = {}) {
     }
     return null;
   }
-  function addColorToItem(prop, color, item) {
-    const addedColor = findColor(color, true);
+  function addColorToItem(prop, color, item, add = true) {
+    const addedColor = findColor(color, add !== false);
     if (item) {
-      const itemColors = item.colors || {};
-      if (!item.colors) {
-        item.colors = itemColors;
-      }
-      itemColors[prop] = addedColor;
+      const itemColors = item._colors || (item._colors = {});
+      itemColors[prop] = addedColor === null ? color : addedColor;
     }
   }
-  function getElementColor(prop, item) {
+  function getElementColor(prop, item, elements2) {
     function find(prop2) {
       var _a;
       let currentItem = item;
       while (currentItem) {
-        const color = (_a = currentItem.colors) == null ? void 0 : _a[prop2];
+        const element = elements2.get(currentItem.index);
+        const color = (_a = element._colors) == null ? void 0 : _a[prop2];
         if (color !== void 0) {
           return color;
         }
-        currentItem = currentItem.parents[0];
+        currentItem = currentItem.parent;
+        if (currentItem == null ? void 0 : currentItem.usedAsMask) {
+          return defaultColorValues[prop2];
+        }
       }
       return defaultColorValues[prop2];
     }
@@ -78,21 +79,18 @@ async function parseColors(svg, options = {}) {
     const parsedColor = stringToColor(value);
     const defaultValue = parsedColor || value;
     if ((parsedColor == null ? void 0 : parsedColor.type) === "function" && parsedColor.func === "url") {
+      addColorToItem(prop, defaultValue, item, false);
       return value;
     }
     if (!options.callback) {
       addColorToItem(prop, defaultValue, item);
       return value;
     }
-    let callbackResult = options.callback(prop, value, parsedColor, item == null ? void 0 : item.tagName);
+    let callbackResult = options.callback(prop, value, parsedColor, item == null ? void 0 : item.tagName, item);
     callbackResult = callbackResult instanceof Promise ? await callbackResult : callbackResult;
     switch (callbackResult) {
       case "remove": {
-        if (item) {
-          item.$element.remove();
-          item.testChildren = false;
-        }
-        return;
+        return item ? callbackResult : void 0;
       }
       case "unset":
         return;
@@ -125,17 +123,52 @@ async function parseColors(svg, options = {}) {
       result.hasGlobalStyle = true;
     }
     return newValue;
-  }, {
-    skipMasks: true
   });
-  await parseSVG(svg, async (item) => {
-    const tagName = item.tagName;
-    if (maskAndSymbolTags.has(tagName)) {
-      item.testChildren = false;
+  const iconData = await analyseSVGStructure(svg, options);
+  const { elements, tree } = iconData;
+  const cheerio = svg.$svg;
+  const removedElements = new Set();
+  const parsedElements = new Set();
+  function removeElement(index, element) {
+    function removeChildren(element2) {
+      element2.children.forEach((item) => {
+        if (item.type !== "tag") {
+          return;
+        }
+        const element3 = item;
+        const index2 = element3._index;
+        if (index2 && !removedElements.has(index2)) {
+          element3._removed = true;
+          removedElements.add(index2);
+          removeChildren(element3);
+        }
+      });
+    }
+    element._removed = true;
+    removedElements.add(index);
+    removeChildren(element);
+    cheerio(element).remove();
+  }
+  async function parseTreeItem(item) {
+    const index = item.index;
+    if (removedElements.has(index) || parsedElements.has(index)) {
       return;
     }
-    const $element = item.$element;
-    const attribs = item.element.attribs;
+    parsedElements.add(index);
+    const element = elements.get(index);
+    if (element._removed) {
+      return;
+    }
+    const { tagName, attribs } = element;
+    if (item.parent) {
+      const parentIndex = item.parent.index;
+      const parentElement = elements.get(parentIndex);
+      if (parentElement._colors) {
+        element._colors = {
+          ...parentElement._colors
+        };
+      }
+    }
     for (let i = 0; i < propsToCheck.length; i++) {
       const prop = propsToCheck[i];
       if (prop === "fill" && animateTags.has(tagName)) {
@@ -143,12 +176,18 @@ async function parseColors(svg, options = {}) {
       }
       const value = attribs[prop];
       if (value !== void 0) {
-        const newValue = await checkColor(prop, value, item);
+        const newValue = await checkColor(prop, value, element);
         if (newValue !== value) {
           if (newValue === void 0) {
-            $element.removeAttr(prop);
+            cheerio(element).removeAttr(prop);
+            if (element._colors) {
+              delete element._colors[prop];
+            }
+          } else if (newValue === "remove") {
+            removeElement(index, element);
+            return;
           } else {
-            $element.attr(prop, newValue);
+            cheerio(element).attr(prop, newValue);
           }
         }
       }
@@ -175,7 +214,7 @@ async function parseColors(svg, options = {}) {
             }
           }
           if (updatedValues) {
-            $element.attr(elementProp, splitValues.join(";"));
+            cheerio(element).attr(elementProp, splitValues.join(";"));
           }
         }
       }
@@ -192,18 +231,15 @@ async function parseColors(svg, options = {}) {
         }
       });
       if (requiredProps) {
-        const itemColors = item.colors || {};
-        if (!item.colors) {
-          item.colors = itemColors;
-        }
+        const itemColors = element._colors || (element._colors = {});
         for (let i = 0; i < requiredProps.length; i++) {
           const prop = requiredProps[i];
-          const color = getElementColor(prop, item);
+          const color = getElementColor(prop, item, elements);
           if (color === defaultBlackColor) {
             if (defaultColor) {
-              const defaultColorValue = typeof defaultColor === "function" ? defaultColor(prop, item) : defaultColor;
+              const defaultColorValue = typeof defaultColor === "function" ? defaultColor(prop, element, item, iconData) : defaultColor;
               findColor(defaultColorValue, true);
-              $element.attr(prop, colorToString(defaultColorValue));
+              cheerio(element).attr(prop, colorToString(defaultColorValue));
               itemColors[prop] = defaultColorValue;
             } else {
               result.hasUnsetColor = true;
@@ -212,7 +248,14 @@ async function parseColors(svg, options = {}) {
         }
       }
     }
-  });
+    for (let i = 0; i < item.children.length; i++) {
+      const childItem = item.children[i];
+      if (!childItem.usedAsMask) {
+        await parseTreeItem(childItem);
+      }
+    }
+  }
+  await parseTreeItem(tree);
   return result;
 }
 function isEmptyColor(color) {

package/lib/download/git/index.js

@@ -6,6 +6,7 @@ const prepare_1 = require("../../export/helpers/prepare");
 const exec_1 = require("../../misc/exec");
 const branch_1 = require("./branch");
 const hash_1 = require("./hash");
+const reset_1 = require("./reset");
 async function downloadGitRepo(options) {
     const { remote, branch } = options;
     // Check for last commit
@@ -32,6 +33,8 @@ async function downloadGitRepo(options) {
                             ? ifModifiedSince.hash
                             : null;
                 if (latestHash === expectedHash) {
+                    // Reset contents before returning
+                    await (0, reset_1.resetGitRepoContents)(options.target);
                     return 'not_modified';
                 }
             }
@@ -51,6 +54,15 @@ async function downloadGitRepo(options) {
         }
         await (0, exec_1.execAsync)(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
     }
+    else {
+        // Attempt to reset contents
+        try {
+            await (0, reset_1.resetGitRepoContents)(options.target);
+        }
+        catch (err) {
+            //
+        }
+    }
     // Get latest hash and make sure correct branch is available
     const hash = await (0, hash_1.getGitRepoHash)(options);
     await (0, branch_1.getGitRepoBranch)(options, branch);

package/lib/download/git/index.mjs

@@ -6,6 +6,7 @@ import {
 import { execAsync } from "../../misc/exec.mjs";
 import { getGitRepoBranch } from "./branch.mjs";
 import { getGitRepoHash } from "./hash.mjs";
+import { resetGitRepoContents } from "./reset.mjs";
 async function downloadGitRepo(options) {
   const { remote, branch } = options;
   const hasHashInTarget = options.target.indexOf("{hash}") !== -1;
@@ -22,6 +23,7 @@ async function downloadGitRepo(options) {
       if (ifModifiedSince) {
         const expectedHash = ifModifiedSince === true ? await getGitRepoHash(options) : typeof ifModifiedSince === "string" ? ifModifiedSince : ifModifiedSince.downloadType === "git" ? ifModifiedSince.hash : null;
         if (latestHash === expectedHash) {
+          await resetGitRepoContents(options.target);
           return "not_modified";
         }
       }
@@ -36,6 +38,11 @@ async function downloadGitRepo(options) {
       console.log(`Cloning ${remote}#${branch} to ${target}`);
     }
     await execAsync(`git clone --branch ${branch} --no-tags --depth 1 ${remote} "${target}"`);
+  } else {
+    try {
+      await resetGitRepoContents(options.target);
+    } catch (err) {
+    }
   }
   const hash = await getGitRepoHash(options);
   await getGitRepoBranch(options, branch);

package/lib/download/git/reset.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Reset Git repo contents
+ */
+export declare function resetGitRepoContents(target: string): Promise<void>;

package/lib/download/git/reset.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resetGitRepoContents = void 0;
+const __1 = require("../..");
+/**
+ * Reset Git repo contents
+ */
+async function resetGitRepoContents(target) {
+    await (0, __1.execAsync)('git add -A', {
+        cwd: target,
+    });
+    await (0, __1.execAsync)('git reset --hard --quiet', {
+        cwd: target,
+    });
+}
+exports.resetGitRepoContents = resetGitRepoContents;

package/lib/download/git/reset.mjs

@@ -0,0 +1,13 @@
+// src/download/git/reset.ts
+import { execAsync } from "../../index.mjs";
+async function resetGitRepoContents(target) {
+  await execAsync("git add -A", {
+    cwd: target
+  });
+  await execAsync("git reset --hard --quiet", {
+    cwd: target
+  });
+}
+export {
+  resetGitRepoContents
+};

package/lib/export/json-package.js

@@ -51,7 +51,12 @@ async function exportJSONPackage(iconSet, options) {
         }
     });
     // Contents
-    const info = exportedJSON.info;
+    const info = exportedJSON.info
+        ? {
+            prefix: iconSet.prefix,
+            ...exportedJSON.info,
+        }
+        : void 0;
     const contents = {
         icons,
         info,

package/lib/export/json-package.mjs

@@ -41,7 +41,10 @@ async function exportJSONPackage(iconSet, options) {
       hasMetadata = true;
     }
   });
-  const info = exportedJSON.info;
+  const info = exportedJSON.info ? {
+    prefix: iconSet.prefix,
+    ...exportedJSON.info
+  } : void 0;
   const contents = {
     icons,
     info,

package/lib/icon-set/index.js

@@ -42,7 +42,7 @@ class IconSet {
     load(data) {
         this.prefix = data.prefix;
         // Defaults
-        const defaultProps = (0, props_1.filterProps)(data);
+        const defaultProps = (0, props_1.filterProps)(data, true);
         // Add icons
         this.entries = Object.create(null);
         const entries = this.entries;
@@ -51,7 +51,10 @@ class IconSet {
             const entry = {
                 type: 'icon',
                 body: item.body,
-                props: { ...defaultProps, ...(0, props_1.filterProps)(item) },
+                props: (0, props_1.filterProps)({
+                    ...defaultProps,
+                    ...item,
+                }, true),
                 chars: new Set(),
                 categories: new Set(),
             };
@@ -62,7 +65,7 @@ class IconSet {
             for (const name in data.aliases) {
                 const item = data.aliases[name];
                 const parent = item.parent;
-                const props = (0, props_1.filterProps)(item);
+                const props = (0, props_1.filterProps)(item, false);
                 const chars = new Set();
                 if (Object.keys(props).length) {
                     // Variation
@@ -599,7 +602,7 @@ class IconSet {
         return this.setItem(name, {
             type: 'icon',
             body: icon.body,
-            props: (0, props_1.filterProps)(icon),
+            props: (0, props_1.filterProps)(icon, true),
             chars: new Set(),
             categories: new Set(),
         });