fix(cleanupIds): handle uri encoded references (#1880)

SethFalco · web-flow · commit c172c9e6d6ac · 2023-12-10T00:31:55.000Z
diff --git a/plugins/cleanupIds.js b/plugins/cleanupIds.js
@@ -215,10 +215,11 @@ exports.fn = (_root, params) => {
               }
             }
             for (const id of ids) {
-              let refs = referencesById.get(id);
+              const decodedId = decodeURI(id);
+              let refs = referencesById.get(decodedId);
               if (refs == null) {
                 refs = [];
-                referencesById.set(id, refs);
+                referencesById.set(decodedId, refs);
               }
               refs.push({ element: node, name });
             }
@@ -261,7 +262,7 @@ exports.fn = (_root, params) => {
                 if (value.includes('#')) {
                   // replace id in href and url()
                   element.attributes[name] = value.replace(
-                    `#${id}`,
+                    `#${encodeURI(id)}`,
                     `#${currentIdString}`
                   );
                 } else {
diff --git a/test/plugins/cleanupIds.25.svg b/test/plugins/cleanupIds.25.svg
@@ -0,0 +1,21 @@
+Should handle non-ASCII IDs and resolve URI encoded references.
+
+See: https://github.com/svg/svgo/issues/1696
+
+===
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+  <defs>
+    <path id="人口" d="M1 1l2 2" stroke="black"/>
+  </defs>
+  <use href="#%E4%BA%BA%E5%8F%A3"/>
+</svg>
+
+@@@
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 9">
+    <defs>
+        <path id="a" d="M1 1l2 2" stroke="black"/>
+    </defs>
+    <use href="#a"/>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,11 @@ exports.fn = (_root, params) => {`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`	`for (const id of ids) {`
`218`		`- let refs = referencesById.get(id);`
	`218`	`+ const decodedId = decodeURI(id);`
	`219`	`+ let refs = referencesById.get(decodedId);`
`219`	`220`	`if (refs == null) {`
`220`	`221`	`refs = [];`
`221`		`- referencesById.set(id, refs);`
	`222`	`+ referencesById.set(decodedId, refs);`
`222`	`223`	`}`
`223`	`224`	`refs.push({ element: node, name });`
`224`	`225`	`}`
`@@ -261,7 +262,7 @@ exports.fn = (_root, params) => {`
`261`	`262`	`if (value.includes('#')) {`
`262`	`263`	`// replace id in href and url()`
`263`	`264`	`element.attributes[name] = value.replace(`
`264`		- `#${id}`,
	`265`	+ `#${encodeURI(id)}`,
`265`	`266`	`#${currentIdString}`
`266`	`267`	`);`
`267`	`268`	`} else {`