@cyberalien/svg-utils 0.0.7 → 0.0.9

package/lib/helpers/hash/unique.d.ts

@@ -1,5 +1,16 @@
+interface Options {
+  prefix?: string;
+  length: number;
+  lengths?: Record<string, number>;
+}
 /**
  * Hash an object, make sure hash is unique
+ *
+ * Number of unique hashes per length, with prefix:
+ * 6 chars = 2b unique hashes
+ * 7 chars = 78b unique hashes <-- got collision here
+ * 8 chars = 2.9t unique hashes
+ * 9 chars = 113t unique hashes
  */
-declare function getUniqueHash(data: unknown, hasPrefix?: boolean, size?: number): string;
+declare function getUniqueHash(data: unknown, options: Options): string;
 export { getUniqueHash };

package/lib/helpers/hash/unique.js

@@ -6,10 +6,20 @@ const uniqueHashes = Object.create(null);
 const uniqueWithPrefixHashes = Object.create(null);
 /**
 * Hash an object, make sure hash is unique
+*
+* Number of unique hashes per length, with prefix:
+* 6 chars = 2b unique hashes
+* 7 chars = 78b unique hashes <-- got collision here
+* 8 chars = 2.9t unique hashes
+* 9 chars = 113t unique hashes
 */
-function getUniqueHash(data, hasPrefix = true, size = 8) {
+function getUniqueHash(data, options) {
+	const { prefix, length, lengths } = options;
 	const str = typeof data === "string" ? data : JSON.stringify(sortObject(data));
-	const hash = hashToString(hashString(str), hasPrefix, size);
+	const hasPrefix = !!prefix;
+	const values = hashString(str);
+	let hash = hashToString(values, hasPrefix, length);
+	if (lengths?.[hash]) hash = hashToString(values, hasPrefix, lengths[hash]);
 	const cache = hasPrefix ? uniqueWithPrefixHashes : uniqueHashes;
 	if (!cache[hash]) cache[hash] = str;
 	else if (cache[hash] !== str) {
@@ -17,7 +27,7 @@ function getUniqueHash(data, hasPrefix = true, size = 8) {
 		console.warn("Data 2:", str);
 		throw new Error(`Hash collision detected: ${hash}`);
 	}
-	return hash;
+	return `${prefix}${hash}`;
 }
 
 export { getUniqueHash };

package/lib/svg/ids.d.ts

@@ -1,7 +1,12 @@
 import { ParsedXMLTagElement } from "../xml/types.js";
 type HashCallback = (id: string, content: string, tagName: string) => string;
+type Result = Record<string, ParsedXMLTagElement[]>;
 /**
  * Change IDs in SVG using a callback function
  */
-declare function changeSVGIDs(root: ParsedXMLTagElement[], callback: HashCallback): void;
-export { changeSVGIDs };
+declare function changeSVGIDs(root: ParsedXMLTagElement[], callback: HashCallback): Result;
+/**
+ * Remove duplicate IDs from SVG
+ */
+declare function removeDuplicateIDs(root: ParsedXMLTagElement[], data: Result): ParsedXMLTagElement[];
+export { changeSVGIDs, removeDuplicateIDs };

package/lib/svg/ids.js

@@ -9,6 +9,7 @@ function changeSVGIDs(root, callback) {
 	const idMap = /* @__PURE__ */ new Map();
 	const idNodes = /* @__PURE__ */ new Map();
 	const nestedIDs = /* @__PURE__ */ new Map();
+	const results = Object.create(null);
 	const usage = [];
 	const parse = (replacement) => {
 		iterateXMLContent(root, (node, stack) => {
@@ -20,7 +21,12 @@ function changeSVGIDs(root, callback) {
 					if (idNodes.has(nodeID)) throw new Error(`Duplicate ID found: ${nodeID}`);
 					idNodes.set(nodeID, node);
 					idMap.set(node, nodeID);
-				} else if (nodeID === replacement[0]) attribs.id = replacement[1];
+				} else if (nodeID === replacement[0]) {
+					const newID = replacement[1];
+					attribs.id = newID;
+					if (!results[newID]) results[newID] = [node];
+					else results[newID].push(node);
+				}
 			}
 			for (const attrib in attribs) {
 				const value = attribs[attrib];
@@ -78,7 +84,7 @@ function changeSVGIDs(root, callback) {
 		});
 	};
 	parse();
-	if (!idMap.size) return;
+	if (!idMap.size) return results;
 	const allIDs = new Set(idMap.values());
 	const parseIDs = (parseAll = false) => {
 		const oldSize = allIDs.size;
@@ -100,8 +106,23 @@ function changeSVGIDs(root, callback) {
 	};
 	while (allIDs.size) if (!parseIDs()) {
 		parseIDs(true);
-		return;
+		return results;
+	}
+	return results;
+}
+/**
+* Remove duplicate IDs from SVG
+*/
+function removeDuplicateIDs(root, data) {
+	const remove = [];
+	for (const id in data) {
+		const nodes = data[id];
+		if (nodes.length > 1) remove.push(...nodes.slice(1));
 	}
+	if (remove.length) return iterateXMLContent(root, (node) => {
+		if (remove.includes(node)) return "remove";
+	});
+	return root;
 }
 
-export { changeSVGIDs };
+export { changeSVGIDs, removeDuplicateIDs };

package/lib/xml/iterate.d.ts

@@ -8,5 +8,5 @@ import { ParsedXMLNode, ParsedXMLTagElement } from "./types.js";
  * - 'abort': stop iteration
  */
 type CallbackResult = void | 'remove' | 'skip' | 'abort';
-declare function iterateXMLContent(root: ParsedXMLTagElement[], callback: (node: ParsedXMLNode, stack: ParsedXMLTagElement[]) => CallbackResult): ParsedXMLNode[];
+declare function iterateXMLContent(root: ParsedXMLTagElement[], callback: (node: ParsedXMLNode, stack: ParsedXMLTagElement[]) => CallbackResult): ParsedXMLTagElement[];
 export { iterateXMLContent };

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.7",
+  "version": "0.0.9",
   "license": "MIT",
   "bugs": "https://github.com/cyberalien/svg-utils/issues",
   "homepage": "https://cyberalien.dev/",