fix uri and urid formats not to convert a space between a plus sign

itchyny · Aug 21, 2024 · 24c60a5 · 24c60a5
1 parent 7f0828d
commit 24c60a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cli/test.yaml b/cli/test.yaml
@@ -6285,9 +6285,9 @@
   args:
     - '@uri'
   input: |
-    [1, {"foo": "<div>&'\"()</div>"}]
+    [1, {"foo": "<div>&'\"()+</div>"}]
   expected: |
-    "%5B1%2C%7B%22foo%22%3A%22%3Cdiv%3E%26%27%5C%22%28%29%3C%2Fdiv%3E%22%7D%5D"
+    "%5B1%2C%7B%22foo%22%3A%22%3Cdiv%3E%26%27%5C%22%28%29%2B%3C%2Fdiv%3E%22%7D%5D"
 
 - name: format strings @uri with string interpolation
   args:
@@ -6301,9 +6301,9 @@
   args:
     - '@urid'
   input: |
-    "%5B1%2C%7B%22foo%22%3A%22%3Cdiv%3E%26%27%5C%22%28%29%3C%2Fdiv%3E%22%7D%5D"
+    "%5B1%2C%7B%22foo%22%3A%22%3Cdiv%3E%26%27%5C%22%28%29%2B%3C%2Fdiv%3E%22%7D%5D"
   expected: |
-    "[1,{\"foo\":\"<div>&'\\\"()</div>\"}]"
+    "[1,{\"foo\":\"<div>&'\\\"()+</div>\"}]"
 
 - name: format strings @urid error
   args:

diff --git a/func.go b/func.go
@@ -884,7 +884,7 @@ func funcToHTML(v any) any {
 func funcToURI(v any) any {
 	switch x := funcToString(v).(type) {
 	case string:
-		return url.QueryEscape(x)
+		return strings.ReplaceAll(url.QueryEscape(x), "+", "%20")
 	default:
 		return x
 	}
@@ -893,7 +893,7 @@ func funcToURI(v any) any {
 func funcToURId(v any) any {
 	switch x := funcToString(v).(type) {
 	case string:
-		x, err := url.QueryUnescape(x)
+		x, err := url.QueryUnescape(strings.ReplaceAll(x, "+", "%2B"))
 		if err != nil {
 			return &func0WrapError{"@urid", v, err}
 		}