@iconify/tools 5.0.9 → 5.0.11

package/lib/css/parse.js

@@ -1,3 +1,4 @@
+import { isBadSVGColor, isSVGColorAttribute } from "../svg/data/colors.js";
 import { getTokens } from "./parser/tokens.js";
 
 /**
@@ -10,6 +11,7 @@ function parseInlineStyle(style) {
 	for (let i = 0; i < tokens.length; i++) {
 		const token = tokens[i];
 		if (token.type !== "rule") return null;
+		if (isSVGColorAttribute(token.prop) && isBadSVGColor(token.value)) continue;
 		results[token.prop] = token.value;
 	}
 	return results;

package/lib/optimise/global-style.js

@@ -1,4 +1,5 @@
 import { parseSVG } from "../svg/parse.js";
+import { isBadSVGColor, isSVGColorAttribute } from "../svg/data/colors.js";
 import { parseSVGStyle } from "../svg/parse-style.js";
 import { allValidTags, animateTags } from "../svg/data/tags.js";
 import { splitClassName } from "@cyberalien/svg-utils";
@@ -82,6 +83,7 @@ function cleanupGlobalStyle(svg) {
 				const tempDataValue = attribs[tempDataAttrbiute];
 				const addedAttributes = new Set(typeof tempDataValue === "string" ? splitClassName(tempDataValue) : []);
 				const prop = styleItem.prop;
+				if (isSVGColorAttribute(prop) && isBadSVGColor(styleItem.value)) return;
 				attribs[prop] = styleItem.value;
 				addedAttributes.add(prop);
 				attribs[tempDataAttrbiute] = Array.from(addedAttributes).join(" ");

package/lib/svg/data/colors.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Check for color attribute
+ */
+declare function isSVGColorAttribute(prop: string): boolean;
+/**
+ * Check for color that cannot be parsed
+ */
+declare function isBadSVGColor(value: string): boolean;
+export { isBadSVGColor, isSVGColorAttribute };

package/lib/svg/data/colors.js

@@ -0,0 +1,14 @@
+/**
+* Check for color attribute
+*/
+function isSVGColorAttribute(prop) {
+	return prop === "fill" || prop === "stroke" || prop.endsWith("color");
+}
+/**
+* Check for color that cannot be parsed
+*/
+function isBadSVGColor(value) {
+	return value.startsWith("color(") || value.startsWith("device-color(") || value.startsWith("var(");
+}
+
+export { isBadSVGColor, isSVGColorAttribute };

package/lib/svg/parse-style.js

@@ -23,11 +23,12 @@ function parseSVGStyle(svg, callback) {
 		const node = item.node;
 		const tagName = node.tag;
 		function parseStyleItem() {
-			const content = stringifyXMLContent(node.children);
+			let content = stringifyXMLContent(node.children);
 			if (!content) {
 				item.removeNode = true;
 				return;
 			}
+			content = content.replace("<![CDATA[", "").replace("]]>", "");
 			const tokens = getTokens(content);
 			if (!(tokens instanceof Array)) throw new Error("Error parsing style. This parser can handle only basic CSS");
 			let changed = false;

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.9",
+  "version": "5.0.11",
   "license": "MIT",
   "bugs": "https://github.com/iconify/tools/issues",
   "homepage": "https://github.com/iconify/tools",