#209 fix namespace name escaping

Author: Jand42

WebSharper.UI.CSharp.Templating.Analyzer/Analyzer.fs

@@ -100,7 +100,7 @@ type WebSharperCSharpTemplatingAnalyzer () =
 
     override this.Initialize(initCtx) =
         initCtx.RegisterSemanticModelAction(fun ctx ->
-            namespaceName <- CodeGenerator.normalizeIdent ctx.SemanticModel.Compilation.AssemblyName + ".Template"
+            namespaceName <- ctx.SemanticModel.Compilation.AssemblyName + ".Template"
             report <- ctx.ReportDiagnostic
             ctx.Options.AdditionalFiles |> Seq.distinct |> Seq.choose (fun f ->
                 let p = f.Path

WebSharper.UI.CSharp.Templating.Build/Task.fs

@@ -60,7 +60,7 @@ type WebSharperUICSharpGeneratorTask() =
         )
 
     override this.Execute() =
-        let namespaceName = CodeGenerator.normalizeIdent this.AssemblyName + ".Template"
+        let namespaceName = this.AssemblyName + ".Template"
         let mutable result = true
         let templateFiles = ResizeArray<ITaskItem>()
         let outputSourceFiles = ResizeArray<ITaskItem>()

WebSharper.UI.CSharp.Templating/CodeGenerator.fs

@@ -48,6 +48,12 @@ let normalizeIdent (s: string) =
     let s = s.[0..0].ToUpperInvariant() + s.[1..]
     invalidIdentifierCharRE.Replace(s, "_")
 
+let private invalidNamespaceCharRE =
+    Regex("[^a-zA-Z0-9_.]", RegexOptions.Compiled)
+
+let normalizeNamespace (s: string) =
+    invalidNamespaceCharRE.Replace(s, "_")
+
 let indent (s: seq<string>) =
     s |> Seq.map (fun s -> "    " + s)
 
@@ -305,12 +311,15 @@ let GetCode namespaceName projectDirectory filePath
     let parsed = Parsing.Parse (getRelPath projectDirectory filePath) projectDirectory serverLoad clientLoad
     let item = parsed.Items.[0] // it's always 1 item because C# doesn't support "foo.html,bar.html" style
     let templateName = normalizeIdent item.Id
+    let namespaceName = normalizeNamespace namespaceName
     autoGeneratedComment + getCodeInternal namespaceName templateName item
 
 let GetCodeClientOnly namespaceName templateName htmlString
         ([<Optional; DefaultParameterValue(ClientLoad.Inline)>] clientLoad) =
     let parsed = Parsing.Parse htmlString null ServerLoad.Once clientLoad
     let item = parsed.Items.[0] // it's always 1 item because C# doesn't support "foo.html,bar.html" style
+    let templateName = normalizeIdent templateName
+    let namespaceName = normalizeNamespace namespaceName
     autoGeneratedComment + getCodeInternal namespaceName templateName item
 
 /// Get the path to the output file for a given input file, creating any necessary directory.