Fix URI template variable name decoding for better service compatibility (#3583)

* Decode URI characters before returning the expanded URI

* remove only and regen smoke test

---------

Co-authored-by: Jiao Di (MSFT) <[email protected]>

Author: joheredi

packages/typespec-test/test/NetworkAnalytics.Management/generated/typespec-ts/sdk/test/arm-test/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/ai/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/batch_modular/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/contentsafety_modular/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/eventgrid_modular/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/healthInsights_radiologyinsights/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/loadtesting_modular/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/nestedClient/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }

packages/typespec-test/test/openai_generic/generated/typespec-ts/src/static-helpers/urlTemplate.ts

@@ -180,7 +180,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions,
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -210,4 +210,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }