From e07b19510c76d188d1234a511a7e74f3976fa9dd Mon Sep 17 00:00:00 2001
From: Piotr Siuszko <siuszko@zoho.com>
Date: Mon, 7 Jul 2025 19:45:32 +0200
Subject: [PATCH] TypeReferenceId RFC 3986 support improvements

---
 crates/bevy_remote/src/builtin_methods.rs      | 2 +-
 crates/bevy_remote/src/schemas/reflect_info.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/bevy_remote/src/builtin_methods.rs b/crates/bevy_remote/src/builtin_methods.rs
index e149b4a060..1f31276b29 100644
--- a/crates/bevy_remote/src/builtin_methods.rs
+++ b/crates/bevy_remote/src/builtin_methods.rs
@@ -1781,7 +1781,7 @@ mod tests {
         );
         {
             let first = response.definitions.iter().next().expect("Should have one");
-            assert_eq!(first.0, &TypeReferenceId::from("glam-Vec3"));
+            assert_eq!(first.0, &TypeReferenceId::from("glam::Vec3"));
         }
         let response = export_registry_types_ext(
             BrpJsonSchemaQueryFilter {
diff --git a/crates/bevy_remote/src/schemas/reflect_info.rs b/crates/bevy_remote/src/schemas/reflect_info.rs
index 573fee2139..b0520d4930 100644
--- a/crates/bevy_remote/src/schemas/reflect_info.rs
+++ b/crates/bevy_remote/src/schemas/reflect_info.rs
@@ -274,10 +274,10 @@ impl Display for TypeReferenceId {
 impl From<&str> for TypeReferenceId {
     fn from(t: &str) -> Self {
         TypeReferenceId(
-            t.replace("::", "-")
-                .replace(", ", "+")
-                .replace(")", "")
-                .replace("(", "")
+            t.replace("::", "__")
+                .replace(", ", ".")
+                .replace(")", "~")
+                .replace("(", "~")
                 .replace(">", "-")
                 .replace("<", "-")
                 .into(),