@cyberalien/svg-utils 0.0.6 → 0.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  /**
2
2
  * Convert hash to a string, usable in CSS for class names and keyframes
3
3
  */
4
- declare function hashToString(value: number[], limit?: number, hasPrefix?: boolean): string;
4
+ declare function hashToString(value: number[], hasPrefix?: boolean, limit?: number): string;
5
5
  export { hashToString };
@@ -5,7 +5,7 @@ const letterRadix = 38;
5
5
  /**
6
6
  * Convert hash to a string, usable in CSS for class names and keyframes
7
7
  */
8
- function hashToString(value, limit = 8, hasPrefix = false) {
8
+ function hashToString(value, hasPrefix = true, limit = 8) {
9
9
  const result = [];
10
10
  let num = value.shift() ?? 0;
11
11
  if (!hasPrefix) {
@@ -1,5 +1,16 @@
1
+ interface Options {
2
+ prefix?: string;
3
+ length: number;
4
+ lengths?: Record<string, number>;
5
+ }
1
6
  /**
2
7
  * Hash an object, make sure hash is unique
8
+ *
9
+ * Number of unique hashes per length, with prefix:
10
+ * 6 chars = 2b unique hashes
11
+ * 7 chars = 78b unique hashes <-- got collision here
12
+ * 8 chars = 2.9t unique hashes
13
+ * 9 chars = 113t unique hashes
3
14
  */
4
- declare function getUniqueHash(data: unknown, hasPrefix?: boolean, size?: number): string;
15
+ declare function getUniqueHash(data: unknown, options: Options): string;
5
16
  export { getUniqueHash };
@@ -6,10 +6,20 @@ const uniqueHashes = Object.create(null);
6
6
  const uniqueWithPrefixHashes = Object.create(null);
7
7
  /**
8
8
  * Hash an object, make sure hash is unique
9
+ *
10
+ * Number of unique hashes per length, with prefix:
11
+ * 6 chars = 2b unique hashes
12
+ * 7 chars = 78b unique hashes <-- got collision here
13
+ * 8 chars = 2.9t unique hashes
14
+ * 9 chars = 113t unique hashes
9
15
  */
10
- function getUniqueHash(data, hasPrefix = false, size = 8) {
16
+ function getUniqueHash(data, options) {
17
+ const { prefix, length, lengths } = options;
11
18
  const str = typeof data === "string" ? data : JSON.stringify(sortObject(data));
12
- const hash = hashToString(hashString(str), size, hasPrefix);
19
+ const hasPrefix = !!prefix;
20
+ const values = hashString(str);
21
+ let hash = hashToString(values, hasPrefix, length);
22
+ if (lengths?.[hash]) hash = hashToString(values, hasPrefix, lengths[hash]);
13
23
  const cache = hasPrefix ? uniqueWithPrefixHashes : uniqueHashes;
14
24
  if (!cache[hash]) cache[hash] = str;
15
25
  else if (cache[hash] !== str) {
@@ -17,7 +27,7 @@ function getUniqueHash(data, hasPrefix = false, size = 8) {
17
27
  console.warn("Data 2:", str);
18
28
  throw new Error(`Hash collision detected: ${hash}`);
19
29
  }
20
- return hash;
30
+ return `${prefix}${hash}`;
21
31
  }
22
32
 
23
33
  export { getUniqueHash };
@@ -3,7 +3,6 @@ interface ParseSVGOptions {
3
3
  useSelfClosing?: boolean;
4
4
  numberTemplate?: string;
5
5
  prettyPrint?: boolean | string;
6
- sortAttributes?: boolean;
7
6
  }
8
7
  /**
9
8
  * Convert parsed XML content to string
@@ -1,8 +1,7 @@
1
1
  const defaultOptions = {
2
2
  useSelfClosing: true,
3
3
  numberTemplate: ` {key}="{value}"`,
4
- prettyPrint: false,
5
- sortAttributes: false
4
+ prettyPrint: false
6
5
  };
7
6
  function assertNever(v) {}
8
7
  /**
@@ -20,9 +19,7 @@ function stringifyXMLContent(root, options) {
20
19
  const nl = prettyPrint === false ? "" : "\n";
21
20
  const add = (node, depth) => {
22
21
  output += tabs(depth) + "<" + node.tag;
23
- const keys = Object.keys(node.attribs);
24
- if (fullOptions.sortAttributes) keys.sort();
25
- for (const key of keys) {
22
+ for (const key in node.attribs) {
26
23
  const value = node.attribs[key];
27
24
  switch (typeof value) {
28
25
  case "string":
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "type": "module",
4
4
  "description": "Common functions for working with SVG used by various packages.",
5
5
  "author": "Vjacheslav Trushkin",
6
- "version": "0.0.6",
6
+ "version": "0.0.8",
7
7
  "license": "MIT",
8
8
  "bugs": "https://github.com/cyberalien/svg-utils/issues",
9
9
  "homepage": "https://cyberalien.dev/",