@iconify/tools 2.0.9 → 2.0.10

package/lib/colors/parse.d.ts

@@ -1,5 +1,6 @@
 import type { Color } from '@iconify/utils/lib/colors/types';
 import type { SVG } from '../svg';
+import { ParseSVGCallbackItem } from '../svg/parse';
 import { ColorAttributes } from './attribs';
 /**
  * Result
@@ -23,9 +24,17 @@ declare type ParseColorsCallback = (attr: ColorAttributes, colorString: string,
 /**
  * Options
  */
+export declare type ParseColorOptionsDefaultColorCallback = (prop: string, item: ExtendedParseSVGCallbackItem) => Color;
 export interface ParseColorsOptions {
     callback?: ParseColorsCallback;
-    defaultColor?: Color | string;
+    defaultColor?: Color | string | ParseColorOptionsDefaultColorCallback;
+}
+/**
+ * Extend properties for item
+ */
+declare type ItemColors = Partial<Record<ColorAttributes, Color | string>>;
+export interface ExtendedParseSVGCallbackItem extends ParseSVGCallbackItem {
+    colors?: ItemColors;
 }
 /**
  * Find colors in icon

package/lib/colors/parse.js

@@ -95,6 +95,10 @@ async function parseColors(svg, options = {}) {
         // Resolve color
         const parsedColor = (0, colors_1.stringToColor)(value);
         const defaultValue = parsedColor || value;
+        // Ignore url()
+        if ((parsedColor === null || parsedColor === void 0 ? void 0 : parsedColor.type) === 'function' && parsedColor.func === 'url') {
+            return value;
+        }
         // Check if callback exists
         if (!options.callback) {
             addColorToItem(prop, defaultValue, item);
@@ -246,10 +250,13 @@ async function parseColors(svg, options = {}) {
                     if (color === attribs_1.defaultBlackColor) {
                         // Default black color: change it
                         if (defaultColor) {
+                            const defaultColorValue = typeof defaultColor === 'function'
+                                ? defaultColor(prop, item)
+                                : defaultColor;
                             // Add color to results and change attribute
-                            findColor(defaultColor, true);
-                            $element.attr(prop, (0, colors_1.colorToString)(defaultColor));
-                            itemColors[prop] = defaultColor;
+                            findColor(defaultColorValue, true);
+                            $element.attr(prop, (0, colors_1.colorToString)(defaultColorValue));
+                            itemColors[prop] = defaultColorValue;
                         }
                         else {
                             result.hasUnsetColor = true;

package/lib/colors/parse.mjs

@@ -77,6 +77,9 @@ async function parseColors(svg, options = {}) {
     }
     const parsedColor = stringToColor(value);
     const defaultValue = parsedColor || value;
+    if ((parsedColor == null ? void 0 : parsedColor.type) === "function" && parsedColor.func === "url") {
+      return value;
+    }
     if (!options.callback) {
       addColorToItem(prop, defaultValue, item);
       return value;
@@ -198,9 +201,10 @@ async function parseColors(svg, options = {}) {
           const color = getElementColor(prop, item);
           if (color === defaultBlackColor) {
             if (defaultColor) {
-              findColor(defaultColor, true);
-              $element.attr(prop, colorToString(defaultColor));
-              itemColors[prop] = defaultColor;
+              const defaultColorValue = typeof defaultColor === "function" ? defaultColor(prop, item) : defaultColor;
+              findColor(defaultColorValue, true);
+              $element.attr(prop, colorToString(defaultColorValue));
+              itemColors[prop] = defaultColorValue;
             } else {
               result.hasUnsetColor = true;
             }

package/lib/colors/validate.js

@@ -35,9 +35,12 @@ async function validateColors(svg, expectMonotone, options) {
                     throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
                 }
                 return;
-            // Do not allow other colors
             default:
-                throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
+                // Allow url()
+                if (color.type !== 'function' || color.func !== 'url') {
+                    // Do not allow other colors
+                    throw new Error('Unexpected color: ' + (0, colors_1.colorToString)(color));
+                }
         }
     });
     return palette;

package/lib/colors/validate.mjs

@@ -23,7 +23,9 @@ async function validateColors(svg, expectMonotone, options) {
         }
         return;
       default:
-        throw new Error("Unexpected color: " + colorToString(color));
+        if (color.type !== "function" || color.func !== "url") {
+          throw new Error("Unexpected color: " + colorToString(color));
+        }
     }
   });
   return palette;

package/lib/icon-set/index.js

@@ -342,6 +342,7 @@ class IconSet {
             .forEach((item) => {
             const names = this.listCategory(item);
             if (names) {
+                names.sort((a, b) => a.localeCompare(b));
                 categories[item.title] = names;
             }
         });

package/lib/icon-set/index.mjs

@@ -271,6 +271,7 @@ var IconSet = class {
     Array.from(this.categories).sort((a, b) => a.title.localeCompare(b.title)).forEach((item) => {
       const names2 = this.listCategory(item);
       if (names2) {
+        names2.sort((a, b) => a.localeCompare(b));
         categories[item.title] = names2;
       }
     });

package/lib/svg/cleanup/root-svg.js

@@ -77,7 +77,7 @@ async function cleanupSVGRoot(svg) {
             $root.removeAttr(attr);
             return;
         }
-        console.log(`Removing unexpected attribute on SVG: ${attr}`);
+        console.warn(`Removing unexpected attribute on SVG: ${attr}`);
         $root.removeAttr(attr);
     });
     if (Object.keys(moveToChildren).length) {

package/lib/svg/cleanup/root-svg.mjs

@@ -60,7 +60,7 @@ async function cleanupSVGRoot(svg) {
       $root.removeAttr(attr);
       return;
     }
-    console.log(`Removing unexpected attribute on SVG: ${attr}`);
+    console.warn(`Removing unexpected attribute on SVG: ${attr}`);
     $root.removeAttr(attr);
   });
   if (Object.keys(moveToChildren).length) {

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@iconify/tools",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.0.9",
+	"version": "2.0.10",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -22,7 +22,7 @@
 		"test": "npm run test:jest && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^1.0.21",
+		"@iconify/utils": "^1.0.22",
 		"@types/cheerio": "^0.22.30",
 		"@types/node-fetch": "^2.5.12",
 		"@types/svgo": "^2.6.0",