Sanitizing characters from variable names to accommodate F# anonymous…

… types. Bumps to 3.0.2
JasperFx · Aug 14, 2023 · 994ad91 · 994ad91
1 parent bab789e
commit 994ad91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.0.1</VersionPrefix>
+    <VersionPrefix>3.0.2</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
     <TargetFrameworks>net6.0;net7.0</TargetFrameworks>

diff --git a/src/JasperFx.CodeGeneration/Model/Variable.cs b/src/JasperFx.CodeGeneration/Model/Variable.cs
@@ -84,6 +84,10 @@ public static Variable For<T>(string? variableName = null)
         return new Variable(typeof(T), variableName ?? DefaultArgName(typeof(T)));
     }
 
+    public static string SanitizeVariableName(string variableName)
+    {
+        return variableName.Replace('<', '_').Replace('>', '_');
+    }
 
     public static string DefaultArgName(Type argType)
     {
@@ -97,7 +101,7 @@ public static string DefaultArgName(Type argType)
             var argPrefix = DefaultArgName(argType.DetermineElementType()!);
             var suffix = argType.GetGenericTypeDefinition().Name.Split('`').First();
 
-            return argPrefix + suffix;
+            return SanitizeVariableName(argPrefix + suffix);
         }
 
         if (argType == typeof(string)) return "stringValue";
@@ -113,7 +117,7 @@ public static string DefaultArgName(Type argType)
         }
 
         var raw = (parts.First().ToLower() + parts.Skip(1).Join("")).Split('`').First();
-        return raw;
+        return SanitizeVariableName(raw);
     }
 
     public static string DefaultArgName<T>()