@cyberalien/svg-utils 0.0.10 → 0.0.12

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

@@ -1,5 +1,5 @@
 /**
  * Convert hash to a string, usable in CSS for class names and keyframes
  */
-declare function hashToString(value: number[], hasPrefix?: boolean, limit?: number): string;
+declare function hashToString(value: number[], hasPrefix?: boolean, limit?: number, caseSensitive?: boolean): string;
 export { hashToString };

package/lib/helpers/hash/stringify.js

@@ -1,11 +1,13 @@
-const firstChars = "abcdefghijklmnopqrstuvwxyz";
-const chars = firstChars + "0123456789_-";
-const firstLetterRadix = 26;
-const letterRadix = 38;
+const baseChars = "abcdefghijklmnopqrstuvwxyz";
+const extraChars = "0123456789_-";
 /**
 * Convert hash to a string, usable in CSS for class names and keyframes
 */
-function hashToString(value, hasPrefix = true, limit = 8) {
+function hashToString(value, hasPrefix = true, limit = 8, caseSensitive = true) {
+	const firstChars = caseSensitive ? baseChars : `${baseChars}${baseChars.toUpperCase()}`;
+	const chars = firstChars + extraChars;
+	const firstLetterRadix = firstChars.length;
+	const letterRadix = chars.length;
 	const result = [];
 	let num = value.shift() ?? 0;
 	if (!hasPrefix) {

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

@@ -1,6 +1,7 @@
 interface Options {
   prefix?: string;
   length: number;
+  caseSensitive?: boolean;
   lengths?: Record<string, number>;
 }
 /**

package/lib/helpers/hash/unique.js

@@ -14,12 +14,12 @@ const uniqueWithPrefixHashes = Object.create(null);
 * 9 chars = 113t unique hashes
 */
 function getUniqueHash(data, options) {
-	const { prefix, length, lengths } = options;
+	const { prefix, length, lengths, caseSensitive } = options;
 	const str = typeof data === "string" ? data : JSON.stringify(sortObject(data));
 	const hasPrefix = !!prefix;
 	const values = hashString(str);
-	let hash = hashToString(values, hasPrefix, length);
-	if (lengths?.[hash]) hash = hashToString(values, hasPrefix, lengths[hash]);
+	let hash = hashToString(values, hasPrefix, length, caseSensitive);
+	if (lengths?.[hash]) hash = hashToString(values, hasPrefix, lengths[hash], caseSensitive);
 	const cache = hasPrefix ? uniqueWithPrefixHashes : uniqueHashes;
 	if (!cache[hash]) cache[hash] = str;
 	else if (cache[hash] !== str) {

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);

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