@iconify/tools 5.0.2 → 5.0.3

package/lib/colors/parse.js

@@ -56,21 +56,21 @@ function parseColors(svg, options = {}) {
 	/**
 	* Get element color
 	*/
-	function getElementColor(prop, item, elements$1) {
-		function find(prop$1) {
+	function getElementColor(prop, item, elements) {
+		function find(prop) {
 			let currentItem = item;
-			const allowDefaultColor = allowDefaultColorValue[prop$1];
+			const allowDefaultColor = allowDefaultColorValue[prop];
 			while (currentItem) {
-				const element = elements$1.get(currentItem.index);
-				const color = element._colors?.[prop$1];
+				const element = elements.get(currentItem.index);
+				const color = element._colors?.[prop];
 				if (color !== void 0) return color;
 				if (allowDefaultColor) {
 					if (allowDefaultColor === true || element.attribs[allowDefaultColor]) return null;
 				}
 				currentItem = currentItem.parent;
-				if (currentItem?.usedAsMask) return defaultColorValues[prop$1];
+				if (currentItem?.usedAsMask) return defaultColorValues[prop];
 			}
-			return defaultColorValues[prop$1];
+			return defaultColorValues[prop];
 		}
 		let propColor = find(prop);
 		if (propColor !== null && typeof propColor === "object" && propColor.type === "current" && prop !== "color") propColor = find("color");
@@ -126,15 +126,15 @@ function parseColors(svg, options = {}) {
 	const removedElements = /* @__PURE__ */ new Set();
 	const parsedElements = /* @__PURE__ */ new Set();
 	function removeElement(index, element) {
-		function removeChildren(element$1) {
-			element$1.children.forEach((item) => {
+		function removeChildren(element) {
+			element.children.forEach((item) => {
 				if (item.type !== "tag") return;
-				const element$2 = item;
-				const index$1 = element$2._index;
-				if (index$1 && !removedElements.has(index$1)) {
-					element$2._removed = true;
-					removedElements.add(index$1);
-					removeChildren(element$2);
+				const element = item;
+				const index = element._index;
+				if (index && !removedElements.has(index)) {
+					element._removed = true;
+					removedElements.add(index);
+					removeChildren(element);
 				}
 			});
 		}

package/lib/css/parser/tree.js

@@ -19,8 +19,8 @@ function tokensTree(tokens) {
 					target.push(newItem);
 					parse(newItem.children);
 					if (!newItem.children.length) {
-						const index$1 = target.indexOf(newItem);
-						if (index$1 !== -1) target.splice(index$1, 1);
+						const index = target.indexOf(newItem);
+						if (index !== -1) target.splice(index, 1);
 					}
 					break;
 				}

package/lib/download/gitlab/hash.js

@@ -11,7 +11,7 @@ async function getGitLabRepoHash(options) {
 	});
 	if (!response.success) throw new Error(`Error downloading data from GitLab API: ${response.error}`);
 	const content = JSON.parse(response.content);
-	const item = (content instanceof Array ? content : [content]).find((item$1) => item$1.name === options.branch && typeof item$1.commit.id === "string");
+	const item = (content instanceof Array ? content : [content]).find((item) => item.name === options.branch && typeof item.commit.id === "string");
 	if (!item) throw new Error("Error parsing GitLab API response");
 	return item.commit.id;
 }

package/lib/download/helpers/unzip.js

@@ -8,9 +8,9 @@ import { unzip as unzip$1 } from "fflate";
 async function unzip(source, path, filter) {
 	const dir = normalize(path);
 	const data = await readFile(source);
-	async function writeFiles(data$1) {
+	async function writeFiles(data) {
 		const createdDirs = /* @__PURE__ */ new Set();
-		for (const name in data$1) {
+		for (const name in data) {
 			const filePath = normalize(join(dir, name));
 			if (filter && !filter(filePath)) continue;
 			if (filePath.startsWith("/") || filePath.includes("../") || filePath.includes(":")) throw new Error("Invalid file path in zip: " + filePath);
@@ -23,16 +23,16 @@ async function unzip(source, path, filter) {
 					await mkdir(fileDir, { recursive: true });
 				} catch {}
 			}
-			if (!isDir) await writeFile(filePath, data$1[name]);
+			if (!isDir) await writeFile(filePath, data[name]);
 		}
 	}
-	return new Promise((resolve$1, reject) => {
+	return new Promise((resolve, reject) => {
 		unzip$1(data, (err, unzipped) => {
 			if (err) {
 				reject(err);
 				return;
 			}
-			writeFiles(unzipped).then(() => resolve$1()).catch((err$1) => reject(err$1));
+			writeFiles(unzipped).then(() => resolve()).catch((err) => reject(err));
 		});
 	});
 }

package/lib/export/icon-package.js

@@ -21,16 +21,16 @@ async function exportIconPackage(iconSet, options) {
 	const esm = options.module !== false;
 	const dir = await prepareDirectoryForExport(options);
 	const typesContent = options.typesContent || defaultTypesContent;
-	await iconSet.forEach(async (name$1) => {
-		const data = iconSet.resolve(name$1, false);
+	await iconSet.forEach(async (name) => {
+		const data = iconSet.resolve(name, false);
 		if (!data) return;
-		const typesFilename = name$1 + ".d.ts";
+		const typesFilename = name + ".d.ts";
 		await promises.writeFile(`${dir}/${typesFilename}`, typesContent, "utf8");
 		files.add(typesFilename);
 		let content = `const data = ` + JSON.stringify(data, null, "	") + ";\n";
 		if (!esm) content += "exports.__esModule = true;\nexports.default = data;\n";
 		else content += "export default data;\n";
-		const contentFilename = name$1 + ".js";
+		const contentFilename = name + ".js";
 		await promises.writeFile(`${dir}/${contentFilename}`, content, "utf8");
 		files.add(contentFilename);
 	});

package/lib/icon-set/index.js

@@ -206,11 +206,11 @@ var IconSet = class {
 		const tree = item && (item.type === "icon" ? [] : this.getTree([name])[name]);
 		if (!tree) return null;
 		let result = {};
-		function parse(name$1) {
-			const item$1 = entries[name$1];
-			if (item$1.type === "alias") return;
-			result = mergeIconData(item$1.props, result);
-			if (item$1.type === "icon") result.body = item$1.body;
+		function parse(name) {
+			const item = entries[name];
+			if (item.type === "alias") return;
+			result = mergeIconData(item.props, result);
+			if (item.type === "icon") result.body = item.body;
 		}
 		parse(name);
 		tree.forEach(parse);
@@ -283,10 +283,10 @@ var IconSet = class {
 		if (Object.keys(chars).length) result.chars = chars;
 		const categories = Object.create(null);
 		Array.from(this.categories).sort((a, b) => a.title.localeCompare(b.title)).forEach((item) => {
-			const names$1 = this.listCategory(item);
-			if (names$1) {
-				names$1.sort((a, b) => a.localeCompare(b));
-				categories[item.title] = names$1;
+			const names = this.listCategory(item);
+			if (names) {
+				names.sort((a, b) => a.localeCompare(b));
+				categories[item.title] = names;
 			}
 		});
 		if (Object.keys(categories).length) result.categories = categories;
@@ -414,14 +414,14 @@ var IconSet = class {
 		delete entries[name];
 		let count = 1;
 		function remove(parent) {
-			Object.keys(entries).filter((name$1) => {
-				const item = entries[name$1];
+			Object.keys(entries).filter((name) => {
+				const item = entries[name];
 				return item.type !== "icon" && item.parent === parent;
-			}).forEach((name$1) => {
-				if (entries[name$1]) {
-					delete entries[name$1];
+			}).forEach((name) => {
+				if (entries[name]) {
+					delete entries[name];
 					count++;
-					remove(name$1);
+					remove(name);
 				}
 			});
 		}

package/lib/import/directory.js

@@ -45,12 +45,12 @@ function isValidFile(item) {
 */
 function importDirectory(path, options = {}) {
 	return new Promise((fulfill, reject) => {
-		scanDirectory(path, (ext, file, subdir, path$1) => {
+		scanDirectory(path, (ext, file, subdir, path) => {
 			const result = {
 				file,
 				ext,
 				subdir,
-				path: path$1
+				path
 			};
 			return isValidFile(result) ? result : false;
 		}, options.includeSubDirs !== false).then((files) => {
@@ -75,12 +75,12 @@ function importDirectory(path, options = {}) {
 * Import all icons from directory synchronously
 */
 function importDirectorySync(path, options = {}) {
-	const files = scanDirectorySync(path, (ext, file, subdir, path$1) => {
+	const files = scanDirectorySync(path, (ext, file, subdir, path) => {
 		const result = {
 			file,
 			ext,
 			subdir,
-			path: path$1
+			path
 		};
 		return isValidFile(result) ? result : false;
 	}, options.includeSubDirs !== false);

package/lib/import/figma/query.js

@@ -29,12 +29,12 @@ async function figmaFilesQuery(options, cache) {
 		if (!cachedData) return true;
 		let ifModifiedSince;
 		if (options.ifModifiedSince === true) try {
-			const parsedData$1 = JSON.parse(cachedData);
-			if (typeof parsedData$1.lastModified !== "string") {
+			const parsedData = JSON.parse(cachedData);
+			if (typeof parsedData.lastModified !== "string") {
 				await clearAPICache(cache.dir);
 				return true;
 			}
-			ifModifiedSince = parsedData$1.lastModified;
+			ifModifiedSince = parsedData.lastModified;
 		} catch {
 			await clearAPICache(cache.dir);
 			return true;
@@ -45,10 +45,10 @@ async function figmaFilesQuery(options, cache) {
 			params: new URLSearchParams(params)
 		};
 		versionCheckParams.params.set("depth", "1");
-		const response$1 = await sendAPIQuery(versionCheckParams);
+		const response = await sendAPIQuery(versionCheckParams);
 		try {
-			if (response$1.success) {
-				if (identicalDates(JSON.parse(response$1.content).lastModified, ifModifiedSince)) return false;
+			if (response.success) {
+				if (identicalDates(JSON.parse(response.content).lastModified, ifModifiedSince)) return false;
 			}
 		} catch {}
 		await clearAPICache(cache.dir);
@@ -79,10 +79,10 @@ async function figmaImagesQuery(options, nodes, cache) {
 	const uri = "https://api.figma.com/v1/images/" + options.file;
 	const maxLength = 2048 - uri.length;
 	const svgOptions = options.svgOptions || {};
-	const query = (ids$1) => {
+	const query = (ids) => {
 		return new Promise((resolve, reject) => {
 			const params = new URLSearchParams({
-				ids: ids$1.join(","),
+				ids: ids.join(","),
 				format: "svg"
 			});
 			if (options.version) params.set("version", options.version);

package/lib/misc/compare-dirs.js

@@ -37,9 +37,9 @@ async function compareDirectories(dir1, dir2, options) {
 		if (!files2.includes(file)) return false;
 		const ext = file.split(".").pop().toLowerCase();
 		if (!textExtensions.has(ext)) {
-			const content1$1 = await promises.readFile(dir1 + "/" + file);
-			const content2$1 = await promises.readFile(dir2 + "/" + file);
-			if (Buffer.compare(content1$1, content2$1) !== 0) return false;
+			const content1 = await promises.readFile(dir1 + "/" + file);
+			const content2 = await promises.readFile(dir2 + "/" + file);
+			if (Buffer.compare(content1, content2) !== 0) return false;
 			continue;
 		}
 		let content1 = await promises.readFile(dir1 + "/" + file, "utf8");

package/lib/optimise/figma.js

@@ -79,39 +79,39 @@ function remove(svg) {
 		parseSVG(svg, (item) => {
 			const node = item.node;
 			const tagName = node.tag;
-			const attribs$1 = node.attribs;
-			Object.keys(attribs$1).forEach((attr) => {
-				const value = attribs$1[attr];
+			const attribs = node.attribs;
+			Object.keys(attribs).forEach((attr) => {
+				const value = attribs[attr];
 				if (typeof value !== "string") return;
 				switch (attr) {
 					case "id":
-						if (!maskTags.has(tagName) && !symbolTag.has(tagName)) delete attribs$1[attr];
+						if (!maskTags.has(tagName) && !symbolTag.has(tagName)) delete attribs[attr];
 						break;
 					case "class":
 					case "xmlns:xlink":
 					case "version":
-						delete attribs$1[attr];
+						delete attribs[attr];
 						break;
 					case "transform": {
 						const trimmed = value.replace(/\s+/g, "").replace(/\.0+/g, "");
-						if (!trimmed || trimmed === "matrix(1,0,0,1,0,0)") delete attribs$1[attr];
+						if (!trimmed || trimmed === "matrix(1,0,0,1,0,0)") delete attribs[attr];
 						break;
 					}
 					case "rx":
 					case "ry":
 					case "x":
 					case "y":
-						if (value === "0") delete attribs$1[attr];
+						if (value === "0") delete attribs[attr];
 						break;
 					case "fill-opacity":
 					case "stroke-opacity":
 					case "opacity":
-						if (value === "1") delete attribs$1[attr];
+						if (value === "1") delete attribs[attr];
 						break;
 					case "fill":
 					case "stroke": {
 						const colorValue = stringToColor(value);
-						if (colorValue?.type === "rgb") attribs$1[attr] = colorToString(colorValue);
+						if (colorValue?.type === "rgb") attribs[attr] = colorToString(colorValue);
 					}
 				}
 			});
@@ -135,9 +135,9 @@ function remove(svg) {
 		if (node.type === "tag") {
 			const tagName = node.tag;
 			if (!defsTag.has(tagName) && !maskTags.has(tagName) && !symbolTag.has(tagName)) {
-				const clipPath$1 = node.attribs["clip-path"];
-				if (typeof clipPath$1 !== "string" || !clipPath$1.startsWith(urlStart) || !clipPath$1.endsWith(urlEnd)) return false;
-				const id = clipPath$1.slice(5, -1);
+				const clipPath = node.attribs["clip-path"];
+				if (typeof clipPath !== "string" || !clipPath.startsWith(urlStart) || !clipPath.endsWith(urlEnd)) return false;
+				const id = clipPath.slice(5, -1);
 				if (typeof clipID === "string" && clipID !== id) return false;
 				clipID = id;
 				shapesToClip.push(node);

package/lib/optimise/global-style.js

@@ -24,8 +24,8 @@ function cleanupGlobalStyle(svg) {
 		].forEach((attr) => {
 			const value = attribs[attr];
 			if (typeof value !== "string") return;
-			value.split(";").forEach((item$1) => {
-				splitClassName(item$1).forEach((className) => {
+			value.split(";").forEach((item) => {
+				splitClassName(item).forEach((className) => {
 					animatedClasses.add(className);
 				});
 			});

package/lib/svg/analyse.js

@@ -46,7 +46,7 @@ function analyseSVGStructure(svg, options = {}) {
 	function gotReusableElement(item, isMask) {
 		const element = item.node;
 		const attribs = element.attribs;
-		const index$1 = element._index;
+		const index = element._index;
 		const id = attribs["id"];
 		if (typeof id !== "string") {
 			const message = `Definition element ${analyseTagError(element)} does not have id`;
@@ -67,7 +67,7 @@ function analyseSVGStructure(svg, options = {}) {
 		element._reusableElement = {
 			id,
 			isMask,
-			index: index$1
+			index
 		};
 		gotElementWithID(element, id, isMask);
 		return true;
@@ -128,9 +128,9 @@ function analyseSVGStructure(svg, options = {}) {
 			const parentBelongsTo = parentElement._belongsTo;
 			if (parentBelongsTo) {
 				const list = element._belongsTo || (element._belongsTo = []);
-				parentBelongsTo.forEach((item$1) => {
-					item$1.indexes.add(index);
-					list.push(item$1);
+				parentBelongsTo.forEach((item) => {
+					item.indexes.add(index);
+					list.push(item);
 				});
 			}
 			if (element._id === void 0) {
@@ -169,21 +169,21 @@ function analyseSVGStructure(svg, options = {}) {
 		const id = item.id;
 		if (ids[id]) return true;
 		function fix() {
-			const index$1 = item.usedByIndex;
-			const element = elements.get(index$1);
+			const index = item.usedByIndex;
+			const element = elements.get(index);
 			const tagName = element.tag;
 			function remove() {
 				const parentIndex = element._parentElement;
 				const parent = typeof parentIndex === "number" ? elements.get(parentIndex) : null;
 				if (parent) {
-					if (parent._childElements) parent._childElements = parent._childElements.filter((num) => num !== index$1);
+					if (parent._childElements) parent._childElements = parent._childElements.filter((num) => num !== index);
 					parent._belongsTo?.forEach((list) => {
-						list.indexes.delete(index$1);
+						list.indexes.delete(index);
 					});
 					parent.children = parent.children.filter((node) => node !== element);
 				}
 			}
-			if (element._linksTo) element._linksTo = element._linksTo.filter((item$1) => item$1.id !== id);
+			if (element._linksTo) element._linksTo = element._linksTo.filter((item) => item.id !== id);
 			if (!element.children.length) {
 				if (useTag.has(tagName)) {
 					remove();
@@ -201,8 +201,8 @@ function analyseSVGStructure(svg, options = {}) {
 		} else throw new Error(message);
 		return false;
 	});
-	function hasChildItem(tree$1, child, canThrow) {
-		const item = tree$1.children.find((item$1) => item$1.index === child.index && item$1.usedAsMask === child.usedAsMask);
+	function hasChildItem(tree, child, canThrow) {
+		const item = tree.children.find((item) => item.index === child.index && item.usedAsMask === child.usedAsMask);
 		if (item && canThrow) throw new Error("Recursion");
 		return !!item;
 	}
@@ -211,9 +211,9 @@ function analyseSVGStructure(svg, options = {}) {
 		usedAsMask: false,
 		children: []
 	};
-	function parseTreeItem(tree$1, usedItems, inMask) {
-		const element = elements.get(tree$1.index);
-		if (tree$1.usedAsMask || inMask) {
+	function parseTreeItem(tree, usedItems, inMask) {
+		const element = elements.get(tree.index);
+		if (tree.usedAsMask || inMask) {
 			element._usedAsMask = true;
 			inMask = true;
 		} else element._usedAsPaint = true;
@@ -225,9 +225,9 @@ function analyseSVGStructure(svg, options = {}) {
 				index: childIndex,
 				usedAsMask: false,
 				children: [],
-				parent: tree$1
+				parent: tree
 			};
-			tree$1.children.push(childItem);
+			tree.children.push(childItem);
 			parseTreeItem(childItem, usedItems, inMask);
 		});
 		element._linksTo?.forEach((link) => {
@@ -237,10 +237,10 @@ function analyseSVGStructure(svg, options = {}) {
 				index: linkIndex,
 				usedAsMask,
 				children: [],
-				parent: tree$1
+				parent: tree
 			};
-			if (hasChildItem(tree$1, childItem, false)) return;
-			tree$1.children.push(childItem);
+			if (hasChildItem(tree, childItem, false)) return;
+			tree.children.push(childItem);
 			parseTreeItem(childItem, usedItems, inMask || usedAsMask);
 		});
 	}

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

@@ -61,7 +61,7 @@ function cleanupInlineStyle(svg) {
 						return;
 					}
 					if (insideClipPathAttributes.has(prop)) {
-						if (item.parents.find((item$1) => item$1.node.tag === "clipPath")) attribs[prop] = value;
+						if (item.parents.find((item) => item.node.tag === "clipPath")) attribs[prop] = value;
 						return;
 					}
 					if (badSoftwareAttributes.has(prop) || badAttributePrefixes.has(prop.split("-").shift()) || knownIgnoredRules.has(prop) || knownIgnoredRules.has(partial)) return;

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

@@ -62,8 +62,8 @@ function cleanupSVGRoot(svg) {
 				wrapper.children.push(child);
 				continue;
 			}
-			const tagName$1 = child.tag;
-			if (tagName$1 === "style" || tagName$1 === "title" || reusableElementsWithPalette.has(tagName$1) || maskTags.has(tagName$1)) root.children.push(child);
+			const tagName = child.tag;
+			if (tagName === "style" || tagName === "title" || reusableElementsWithPalette.has(tagName) || maskTags.has(tagName)) root.children.push(child);
 			else wrapper.children.push(child);
 		}
 		root.children.push(wrapper);

package/lib/svg/parse-style.js

@@ -30,7 +30,7 @@ function parseSVGStyle(svg, callback) {
 			}
 			const tokens = getTokens(content);
 			if (!(tokens instanceof Array)) throw new Error("Error parsing style. This parser can handle only basic CSS");
-			let changed$1 = false;
+			let changed = false;
 			const selectorStart = [];
 			let newTokens = [];
 			while (tokens.length) {
@@ -105,7 +105,7 @@ function parseSVGStyle(svg, callback) {
 							assertNotOldCode(result);
 							if (isAnimation) {
 								if (result !== value) {
-									changed$1 = true;
+									changed = true;
 									token.value = result;
 								}
 								newTokens.push(token);
@@ -116,14 +116,14 @@ function parseSVGStyle(svg, callback) {
 								newTokens.push(token);
 							}
 						} else {
-							changed$1 = true;
+							changed = true;
 							for (let i = 0; i < skipCount; i++) tokens.shift();
 						}
 						break;
 					}
 					case "rule": {
 						const value = token.value;
-						const selectorTokens = selectorStart.map((index) => newTokens[index]).filter((item$1) => item$1 !== null);
+						const selectorTokens = selectorStart.map((index) => newTokens[index]).filter((item) => item !== null);
 						const result = callback({
 							type: "global",
 							prop: token.prop,
@@ -142,17 +142,17 @@ function parseSVGStyle(svg, callback) {
 						if (result !== void 0) {
 							assertNotOldCode(result);
 							if (result !== value) {
-								changed$1 = true;
+								changed = true;
 								token.value = result;
 							}
 							newTokens.push(token);
-						} else changed$1 = true;
+						} else changed = true;
 						break;
 					}
 					default: assertNever(token);
 				}
 			}
-			if (changed$1) {
+			if (changed) {
 				const tree = tokensTree(newTokens.filter((token) => token !== null));
 				if (!tree.length) item.removeNode = true;
 				else node.children = [{

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": "5.0.2",
+  "version": "5.0.3",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",
@@ -14,7 +14,7 @@
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@cyberalien/svg-utils": "^1.0.11",
+    "@cyberalien/svg-utils": "^1.1.1",
     "@iconify/types": "^2.0.0",
     "@iconify/utils": "^3.1.0",
     "fflate": "^0.8.2",
@@ -26,19 +26,19 @@
     "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.2",
     "@types/jest": "^30.0.0",
-    "@types/node": "^24.10.4",
-    "@typescript-eslint/eslint-plugin": "^8.50.1",
-    "@typescript-eslint/parser": "^8.50.1",
+    "@types/node": "^24.10.9",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-prettier": "^5.5.5",
     "globals": "^16.5.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.1",
     "rimraf": "^6.1.2",
-    "tsdown": "^0.18.3",
+    "tsdown": "^0.20.1",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.18"
   },
   "exports": {
     "./*": "./*",