@cyberalien/svg-utils 0.0.9 → 0.0.11

package/lib/svg/ids.js

@@ -94,7 +94,32 @@ function changeSVGIDs(root, callback) {
 				const node = idNodes.get(id);
 				const newNode = cloneObject(node);
 				delete newNode.attribs.id;
-				for (const usageItem of usage) if (usageItem.node === node && usageItem.id === id) delete newNode.attribs[usageItem.attrib];
+				for (const usageItem of usage) if (usageItem.node === node && usageItem.id === id) {
+					const attr = usageItem.attrib;
+					const value = newNode.attribs[attr];
+					if (value === id) newNode.attribs[attr] = "";
+					else {
+						const parts = value.split(id);
+						const newValue = [];
+						const total = parts.length;
+						for (let i = 0; i < total; i++) {
+							if (i > 0) {
+								newValue.push(parts[i - 1]);
+								if (parts[i - i].slice(-1) !== ";") {
+									newValue.push(id);
+									continue;
+								}
+							}
+							if (i < total - 1) {
+								if (parts[i].slice(0, 1) !== ".") {
+									newValue.push(parts[i]);
+									continue;
+								}
+							}
+						}
+						newNode.attribs[attr] = newValue.join("");
+					}
+				}
 				const content = stringifyXMLContent([newNode]);
 				if (!content) throw new Error(`Failed to stringify node with ID: ${id}`);
 				const newID = callback(id, content, node.tag);
@@ -114,14 +139,21 @@ function changeSVGIDs(root, callback) {
 * Remove duplicate IDs from SVG
 */
 function removeDuplicateIDs(root, data) {
-	const remove = [];
+	const remove = /* @__PURE__ */ new Set();
 	for (const id in data) {
 		const nodes = data[id];
-		if (nodes.length > 1) remove.push(...nodes.slice(1));
+		if (nodes.length > 1) remove.add(id);
+	}
+	if (remove.size) {
+		const removing = /* @__PURE__ */ new Set();
+		return iterateXMLContent(root, (node) => {
+			if (node.type !== "tag") return;
+			const id = node.attribs.id;
+			if (typeof id !== "string" || !remove.has(id)) return;
+			if (removing.has(id)) return "remove";
+			removing.add(id);
+		});
 	}
-	if (remove.length) return iterateXMLContent(root, (node) => {
-		if (remove.includes(node)) return "remove";
-	});
 	return root;
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "description": "Common functions for working with SVG used by various packages.",
   "author": "Vjacheslav Trushkin",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "license": "MIT",
   "bugs": "https://github.com/cyberalien/svg-utils/issues",
   "homepage": "https://cyberalien.dev/",