@iconify/tools 2.1.0-beta.7 → 2.1.1

package/lib/svg/cleanup/inline-style.cjs

@@ -24,9 +24,13 @@ async function cleanupInlineStyle(svg) {
         const newStyle = /* @__PURE__ */ Object.create(null);
         const checkRule = (prop, value) => {
           function warn() {
-            console.warn(`Removing unexpected style on "${tagName}": ${prop}`);
+            console.warn(
+              `Removing unexpected style on "${tagName}": ${prop}`
+            );
           }
-          if (svg_data_attributes.badAttributes.has(prop) || svg_data_attributes.tagSpecificNonPresentationalAttributes[tagName]?.has(prop)) {
+          if (svg_data_attributes.badAttributes.has(prop) || svg_data_attributes.tagSpecificNonPresentationalAttributes[tagName]?.has(
+            prop
+          )) {
             return;
           }
           if (svg_data_attributes.tagSpecificAnimatedAttributes[tagName]?.has(prop) || svg_data_attributes.tagSpecificPresentationalAttributes[tagName]?.has(prop)) {
@@ -38,12 +42,16 @@ async function cleanupInlineStyle(svg) {
             return;
           }
           if (svg_data_attributes.insideClipPathAttributes.has(prop)) {
-            if (item.parents.find((item2) => item2.tagName === "clipPath")) {
+            if (item.parents.find(
+              (item2) => item2.tagName === "clipPath"
+            )) {
               $element.attr(prop, value);
             }
             return;
           }
-          if (svg_data_attributes.badSoftwareAttributes.has(prop) || svg_data_attributes.badAttributePrefixes.has(prop.split("-").shift())) {
+          if (svg_data_attributes.badSoftwareAttributes.has(prop) || svg_data_attributes.badAttributePrefixes.has(
+            prop.split("-").shift()
+          )) {
             return;
           }
           if (prop.slice(0, 1) === "-") {

package/lib/svg/cleanup/inline-style.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../index.js';
-import '../../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 /**

package/lib/svg/cleanup/inline-style.mjs

@@ -20,9 +20,13 @@ async function cleanupInlineStyle(svg) {
         const newStyle = /* @__PURE__ */ Object.create(null);
         const checkRule = (prop, value) => {
           function warn() {
-            console.warn(`Removing unexpected style on "${tagName}": ${prop}`);
+            console.warn(
+              `Removing unexpected style on "${tagName}": ${prop}`
+            );
           }
-          if (badAttributes.has(prop) || tagSpecificNonPresentationalAttributes[tagName]?.has(prop)) {
+          if (badAttributes.has(prop) || tagSpecificNonPresentationalAttributes[tagName]?.has(
+            prop
+          )) {
             return;
           }
           if (tagSpecificAnimatedAttributes[tagName]?.has(prop) || tagSpecificPresentationalAttributes[tagName]?.has(prop)) {
@@ -34,12 +38,16 @@ async function cleanupInlineStyle(svg) {
             return;
           }
           if (insideClipPathAttributes.has(prop)) {
-            if (item.parents.find((item2) => item2.tagName === "clipPath")) {
+            if (item.parents.find(
+              (item2) => item2.tagName === "clipPath"
+            )) {
               $element.attr(prop, value);
             }
             return;
           }
-          if (badSoftwareAttributes.has(prop) || badAttributePrefixes.has(prop.split("-").shift())) {
+          if (badSoftwareAttributes.has(prop) || badAttributePrefixes.has(
+            prop.split("-").shift()
+          )) {
             return;
           }
           if (prop.slice(0, 1) === "-") {

package/lib/svg/cleanup/root-style.d.ts

@@ -1,6 +1,6 @@
 import { SVG } from '../index.js';
 import { parseSVGStyle } from '../parse-style.js';
-import '../../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 import '../../css/parser/types.js';
 import '../parse.js';

package/lib/svg/cleanup/root-svg.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../index.js';
-import '../../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 /**

package/lib/svg/cleanup/svgo-style.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from '../index.js';
-import '../../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 /**

package/lib/svg/cleanup.d.ts

@@ -1,5 +1,5 @@
 import { SVG } from './index.js';
-import '../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 /**

package/lib/svg/data/attributes.cjs

@@ -26,7 +26,6 @@ const junkSVGAttributes = /* @__PURE__ */ new Set([
   "zoomAndPan"
 ]);
 const badSoftwareAttributes = /* @__PURE__ */ new Set([
-  "color-interpolation-filters",
   "isolation",
   "enable-background",
   "overflow",

package/lib/svg/data/attributes.mjs

@@ -22,7 +22,6 @@ const junkSVGAttributes = /* @__PURE__ */ new Set([
   "zoomAndPan"
 ]);
 const badSoftwareAttributes = /* @__PURE__ */ new Set([
-  "color-interpolation-filters",
   "isolation",
   "enable-background",
   "overflow",

package/lib/svg/index.cjs

@@ -29,7 +29,10 @@ class SVG {
     const $root = this.$svg(":root");
     const box = this.viewBox;
     if ($root.attr("viewBox") === void 0) {
-      $root.attr("viewBox", `${box.left} ${box.top} ${box.width} ${box.height}`);
+      $root.attr(
+        "viewBox",
+        `${box.left} ${box.top} ${box.width} ${box.height}`
+      );
     }
     if ($root.attr("width") === void 0) {
       $root.attr("width", box.width.toString());
@@ -50,7 +53,9 @@ class SVG {
         case "fill":
         case "stroke":
         case "opacity":
-          throw new Error(`Cannot use getBody() on icon that was not cleaned up with cleanupSVGRoot(). Icon has attribute ${key}="${attribs[key]}"`);
+          throw new Error(
+            `Cannot use getBody() on icon that was not cleaned up with cleanupSVGRoot(). Icon has attribute ${key}="${attribs[key]}"`
+          );
       }
     }
     return utils.trimSVG(this.$svg("svg").html());
@@ -78,7 +83,11 @@ class SVG {
     remove("<!--", "-->", "");
     remove("<?xml", "?>", "");
     remove("<!DOCTYPE svg", "<svg", "<svg");
-    remove('xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"', "", "");
+    remove(
+      'xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"',
+      "",
+      ""
+    );
     remove('xml:space="preserve"', "", "");
     content = content.replace(/<g>\s*<\/g>/g, "");
     this.$svg = cheerio__default.load(content.trim(), {

package/lib/svg/index.d.ts

@@ -1,5 +1,5 @@
-import { I as IconifyIcon } from '../types-f0980297.js';
-export { I as IconifyIcon } from '../types-f0980297.js';
+import { IconifyIcon } from '@iconify/types';
+export { IconifyIcon } from '@iconify/types';
 import { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 export { IconifyIconCustomisations } from '@iconify/utils/lib/customisations/defaults';
 

package/lib/svg/index.mjs

@@ -21,7 +21,10 @@ class SVG {
     const $root = this.$svg(":root");
     const box = this.viewBox;
     if ($root.attr("viewBox") === void 0) {
-      $root.attr("viewBox", `${box.left} ${box.top} ${box.width} ${box.height}`);
+      $root.attr(
+        "viewBox",
+        `${box.left} ${box.top} ${box.width} ${box.height}`
+      );
     }
     if ($root.attr("width") === void 0) {
       $root.attr("width", box.width.toString());
@@ -42,7 +45,9 @@ class SVG {
         case "fill":
         case "stroke":
         case "opacity":
-          throw new Error(`Cannot use getBody() on icon that was not cleaned up with cleanupSVGRoot(). Icon has attribute ${key}="${attribs[key]}"`);
+          throw new Error(
+            `Cannot use getBody() on icon that was not cleaned up with cleanupSVGRoot(). Icon has attribute ${key}="${attribs[key]}"`
+          );
       }
     }
     return trimSVG(this.$svg("svg").html());
@@ -70,7 +75,11 @@ class SVG {
     remove("<!--", "-->", "");
     remove("<?xml", "?>", "");
     remove("<!DOCTYPE svg", "<svg", "<svg");
-    remove('xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"', "", "");
+    remove(
+      'xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"',
+      "",
+      ""
+    );
     remove('xml:space="preserve"', "", "");
     content = content.replace(/<g>\s*<\/g>/g, "");
     this.$svg = cheerio.load(content.trim(), {

package/lib/svg/parse-style.cjs

@@ -51,14 +51,17 @@ async function parseSVGStyle(svg, callback) {
           value,
           token,
           selectorTokens,
-          selectors: selectorTokens.reduce((prev, current) => {
-            switch (current.type) {
-              case "selector": {
-                return prev.concat(current.selectors);
+          selectors: selectorTokens.reduce(
+            (prev, current) => {
+              switch (current.type) {
+                case "selector": {
+                  return prev.concat(current.selectors);
+                }
               }
-            }
-            return prev;
-          }, []),
+              return prev;
+            },
+            []
+          ),
           prevTokens: newTokens,
           nextTokens: tokens.slice(i + 1)
         });
@@ -78,7 +81,9 @@ async function parseSVGStyle(svg, callback) {
       if (!changed2) {
         return;
       }
-      const tree = css_parser_tree.tokensTree(newTokens.filter((token) => token !== null));
+      const tree = css_parser_tree.tokensTree(
+        newTokens.filter((token) => token !== null)
+      );
       if (!tree.length) {
         $element.remove();
         return;

package/lib/svg/parse-style.d.ts

@@ -1,7 +1,7 @@
 import { SVG } from './index.js';
 import { CSSRuleToken, CSSToken } from '../css/parser/types.js';
 import { ParseSVGCallbackItem } from './parse.js';
-import '../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 import '../misc/cheerio.js';
 

package/lib/svg/parse-style.mjs

@@ -47,14 +47,17 @@ async function parseSVGStyle(svg, callback) {
           value,
           token,
           selectorTokens,
-          selectors: selectorTokens.reduce((prev, current) => {
-            switch (current.type) {
-              case "selector": {
-                return prev.concat(current.selectors);
+          selectors: selectorTokens.reduce(
+            (prev, current) => {
+              switch (current.type) {
+                case "selector": {
+                  return prev.concat(current.selectors);
+                }
               }
-            }
-            return prev;
-          }, []),
+              return prev;
+            },
+            []
+          ),
           prevTokens: newTokens,
           nextTokens: tokens.slice(i + 1)
         });
@@ -74,7 +77,9 @@ async function parseSVGStyle(svg, callback) {
       if (!changed2) {
         return;
       }
-      const tree = tokensTree(newTokens.filter((token) => token !== null));
+      const tree = tokensTree(
+        newTokens.filter((token) => token !== null)
+      );
       if (!tree.length) {
         $element.remove();
         return;

package/lib/svg/parse.d.ts

@@ -1,6 +1,6 @@
 import { CheerioElement, WrappedCheerioElement } from '../misc/cheerio.js';
 import { SVG } from './index.js';
-import '../types-f0980297.js';
+import '@iconify/types';
 import '@iconify/utils/lib/customisations/defaults';
 
 /**

package/package.json

@@ -3,7 +3,7 @@
 	"type": "module",
 	"description": "Collection of functions for cleaning up and parsing SVG for Iconify project",
 	"author": "Vjacheslav Trushkin",
-	"version": "2.1.0-beta.7",
+	"version": "2.1.1",
 	"license": "MIT",
 	"bugs": "https://github.com/iconify/tools/issues",
 	"homepage": "https://github.com/iconify/tools",
@@ -25,19 +25,22 @@
 		"test": "npm run test:jest-cjs && npm run test:jest-esm && npm run test:jasmine"
 	},
 	"dependencies": {
-		"@iconify/utils": "^2.0.0-beta.4",
-		"@types/cheerio": "^0.22.30",
-		"@types/node-fetch": "^2.5.12",
-		"@types/svgo": "^2.6.0",
-		"@types/tar": "^6.1.0",
-		"cheerio": "^1.0.0-rc.10",
+		"@iconify/utils": "^2.0.1",
+		"@types/cheerio": "^0.22.31",
+		"@types/node-fetch": "^2.6.2",
+		"@types/svgo": "^2.6.4",
+		"@types/tar": "^6.1.3",
+		"cheerio": "^1.0.0-rc.12",
 		"extract-zip": "^2.0.1",
-		"local-pkg": "^0.4.1",
+		"local-pkg": "^0.4.2",
 		"node-fetch": "^2.6.7",
-		"pathe": "^0.2.0",
+		"pathe": "^0.3.9",
 		"svgo": "^2.8.0",
 		"tar": "^6.1.11"
 	},
+	"peerDependencies": {
+		"@iconify/types": "*"
+	},
 	"exports": {
 		"./*": "./*",
 		".": {
@@ -48,6 +51,10 @@
 			"require": "./lib/colors/attribs.cjs",
 			"import": "./lib/colors/attribs.mjs"
 		},
+		"./lib/colors/detect": {
+			"require": "./lib/colors/detect.cjs",
+			"import": "./lib/colors/detect.mjs"
+		},
 		"./lib/colors/parse": {
 			"require": "./lib/colors/parse.cjs",
 			"import": "./lib/colors/parse.mjs"
@@ -248,6 +255,10 @@
 			"require": "./lib/icon-set/props.cjs",
 			"import": "./lib/icon-set/props.mjs"
 		},
+		"./lib/icon-set/tags": {
+			"require": "./lib/icon-set/tags.cjs",
+			"import": "./lib/icon-set/tags.mjs"
+		},
 		"./lib/icon-set/types": {
 			"require": "./lib/icon-set/types.cjs",
 			"import": "./lib/icon-set/types.mjs"
@@ -403,6 +414,10 @@
 		"./lib/svg/parse-style": {
 			"require": "./lib/svg/parse-style.cjs",
 			"import": "./lib/svg/parse-style.mjs"
+		},
+		"./lib/tests/load": {
+			"require": "./lib/tests/load.cjs",
+			"import": "./lib/tests/load.mjs"
 		}
 	}
 }

package/lib/types-f0980297.d.ts

@@ -1,258 +0,0 @@
-/**
- * Icon dimensions.
- *
- * Used in:
- *  icon (as is)
- *  alias (overwrite icon's properties)
- *  root of JSON file (default values)
- */
-interface IconifyDimenisons {
-	// Left position of viewBox.
-	// Defaults to 0.
-	left?: number;
-
-	// Top position of viewBox.
-	// Defaults to 0.
-	top?: number;
-
-	// Width of viewBox.
-	// Defaults to 16.
-	width?: number;
-
-	// Height of viewBox.
-	// Defaults to 16.
-	height?: number;
-}
-
-/**
- * Icon transformations.
- *
- * Used in:
- *  icon (as is)
- *  alias (merged with icon's properties)
- */
-interface IconifyTransformations {
-	// Number of 90 degrees rotations.
-	// 0 = 0, 1 = 90deg and so on.
-	// Defaults to 0.
-	// When merged (such as alias + icon), result is icon.rotation + alias.rotation.
-	rotate?: number;
-
-	// Horizontal flip.
-	// Defaults to false.
-	// When merged, result is icon.hFlip !== alias.hFlip
-	hFlip?: boolean;
-
-	// Vertical flip. (see hFlip comments)
-	vFlip?: boolean;
-}
-
-/**
- * Combination of dimensions and transformations.
- */
-interface IconifyOptional
-	extends IconifyDimenisons,
-		IconifyTransformations {
-	//
-}
-
-/**
- * Alias.
- */
-interface IconifyAlias extends IconifyOptional {
-	// Parent icon index without prefix, required.
-	parent: string;
-
-	// IconifyOptional properties.
-	// Alias should have only properties that it overrides.
-	// Transformations are merged, not overridden. See IconifyTransformations comments.
-}
-
-/**
- * Icon.
- */
-interface IconifyIcon extends IconifyOptional {
-	// Icon body: <path d="..." />, required.
-	body: string;
-
-	// IconifyOptional properties.
-	// If property is missing in JSON file, look in root object for default value.
-}
-
-/**
- * Icon with optional parameters that are provided by API and affect only search
- */
-interface APIIconAttributes {
-	// True if icon is hidden.
-	// Used in icon sets to keep icons that no longer exist, but should still be accessible
-	// from API, preventing websites from breaking when icon is removed by developer.
-	hidden?: boolean;
-}
-
-interface ExtendedIconifyIcon extends IconifyIcon, APIIconAttributes {}
-interface ExtendedIconifyAlias extends IconifyAlias, APIIconAttributes {}
-
-/**
- * "icons" field of JSON file.
- */
-interface IconifyIcons {
-	// Index is name of icon, without prefix. Value is ExtendedIconifyIcon object.
-	[index: string]: ExtendedIconifyIcon;
-}
-
-/**
- * "aliases" field of JSON file.
- */
-interface IconifyAliases {
-	// Index is name of icon, without prefix. Value is ExtendedIconifyAlias object.
-	[index: string]: ExtendedIconifyAlias;
-}
-
-/**
- * Icon set information block.
- */
-interface IconifyInfo {
-	// Icon set name.
-	name: string;
-
-	// Total number of icons.
-	total?: number;
-
-	// Version string.
-	version?: string;
-
-	// Author information.
-	author: {
-		// Author name.
-		name: string;
-
-		// Link to author's website or icon set website.
-		url?: string;
-	};
-
-	// License
-	license: {
-		// Human readable license.
-		title: string;
-
-		// SPDX license identifier.
-		spdx?: string;
-
-		// License URL.
-		url?: string;
-	};
-
-	// Array of icons that should be used for samples in icon sets list.
-	samples?: string[];
-
-	// Icon grid: number or array of numbers.
-	height?: number | number[];
-
-	// Display height for samples: 16 - 24
-	displayHeight?: number;
-
-	// Category on Iconify collections list.
-	category?: string;
-
-	// Palette status. True if icons have predefined color scheme, false if icons use currentColor.
-	// Ideally, icon set should not mix icons with and without palette to simplify search.
-	palette?: boolean;
-
-	// If true, icon set should not appear in icon sets list.
-	hidden?: boolean;
-}
-
-/**
- * Optional themes, old format.
- *
- * Deprecated because format is unnecessary complicated. Key is meaningless, suffixes and prefixes are mixed together.
- */
-interface LegacyIconifyThemes {
-	// Key is unique string.
-	[index: string]: {
-		// Theme title.
-		title: string;
-
-		// Icon prefix or suffix, including dash. All icons that start with prefix and end with suffix belong to theme.
-		prefix?: string; // Example: 'baseline-'
-		suffix?: string; // Example: '-filled'
-	};
-}
-
-/**
- * Characters used in font.
- */
-interface IconifyChars {
-	// Index is character, such as "f000".
-	// Value is icon name.
-	[index: string]: string;
-}
-
-/**
- * Icon categories
- */
-interface IconifyCategories {
-	// Index is category title, such as "Weather".
-	// Value is array of icons that belong to that category.
-	// Each icon can belong to multiple categories or no categories.
-	[index: string]: string[];
-}
-
-/**
- * Meta data stored in JSON file, used for browsing icon set.
- */
-interface IconifyMetaData {
-	// Icon set information block. Used for public icon sets, can be skipped for private icon sets.
-	info?: IconifyInfo;
-
-	// Characters used in font. Used for searching by character for icon sets imported from font, exporting icon set to font.
-	chars?: IconifyChars;
-
-	// Categories. Used for filtering icons.
-	categories?: IconifyCategories;
-
-	// Optional themes (old format).
-	themes?: LegacyIconifyThemes;
-
-	// Optional themes (new format). Key is prefix or suffix, value is title.
-	prefixes?: Record<string, string>;
-	suffixes?: Record<string, string>;
-}
-
-/**
- * JSON structure, contains only icon data
- */
-interface IconifyJSONIconsData extends IconifyDimenisons {
-	// Prefix for icons in JSON file, required.
-	prefix: string;
-
-	// API provider, optional.
-	provider?: string;
-
-	// List of icons, required.
-	icons: IconifyIcons;
-
-	// Optional aliases.
-	aliases?: IconifyAliases;
-
-	// IconifyDimenisons properties that are used as default viewbox for icons when icon is missing value.
-	// If viewbox exists in both icon and root, use value from icon.
-	// This is used to reduce duplication.
-}
-
-/**
- * JSON structure.
- *
- * All optional values can exist in root of JSON file, used as defaults.
- */
-interface IconifyJSON extends IconifyJSONIconsData, IconifyMetaData {
-	// Last modification time of icons. Unix time stamp in seconds.
-	// Time is calculated only for icon data, ignoring metadata.
-	// Used to invalidate icons cache in components.
-	lastModified?: number;
-
-	// Optional list of missing icons. Returned by Iconify API when querying for icons that do not exist.
-	not_found?: string[];
-}
-
-export { ExtendedIconifyIcon as E, IconifyIcon as I, IconifyInfo as a, IconifyJSON as b, ExtendedIconifyAlias as c, IconifyOptional as d };