fix: Encode fragmentIdentifier with URL hash setter

sindresorhus · Dec 11, 2022 · 12456f9 · 12456f9
1 parent 5beef41
commit 12456f9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -222,7 +222,15 @@ function validateArrayFormatSeparator(value) {
 
 function encode(value, options) {
 	if (options.encode) {
-		return options.strict ? strictUriEncode(value) : encodeURIComponent(value);
+		if (options[encodeFragmentIdentifier]) {
+			return encodeURI(value);
+		}
+
+		if (options.strict) {
+			return strictUriEncode(value);
+		}
+
+		return encodeURIComponent(value);
 	}
 
 	return value;
@@ -455,7 +463,9 @@ exports.stringifyUrl = (object, options) => {
 
 	let hash = getHash(object.url);
 	if (object.fragmentIdentifier) {
-		hash = `#${options[encodeFragmentIdentifier] ? encode(object.fragmentIdentifier, options) : object.fragmentIdentifier}`;
+		const urlObjectForFragmentEncode = new URL(url);
+		urlObjectForFragmentEncode.hash = object.fragmentIdentifier;
+		hash = options[encodeFragmentIdentifier] ? urlObjectForFragmentEncode.hash : `#${object.fragmentIdentifier}`;
 	}
 
 	return `${url}${queryString}${hash}`;

diff --git a/test/stringify-url.js b/test/stringify-url.js
@@ -26,6 +26,7 @@ test('stringify URL with fragment identifier', t => {
 	t.deepEqual(queryString.stringifyUrl({url: 'https://foo.bar/#abc', query: {}, fragmentIdentifier: 'top'}), 'https://foo.bar/#top');
 	t.deepEqual(queryString.stringifyUrl({url: 'https://foo.bar', query: {}}), 'https://foo.bar');
 	t.deepEqual(queryString.stringifyUrl({url: 'https://foo.bar', query: {}, fragmentIdentifier: 'foo bar'}), 'https://foo.bar#foo%20bar');
+	t.deepEqual(queryString.stringifyUrl({url: 'https://foo.bar/', query: {}, fragmentIdentifier: '/foo/bar'}), 'https://foo.bar/#/foo/bar');
 });
 
 test('skipEmptyString:: stringify URL with a query string', t => {