From 51b8ba073c9dc34b203ac04f3f48dbb1dc21c306 Mon Sep 17 00:00:00 2001 From: MattMo Date: Fri, 23 Feb 2024 16:55:40 -0800 Subject: [PATCH] Bumped package version to 1.8.3. Added code to escape the names of fields, properties when generating the constructor. --- Rest.Net/Rest.Net.csproj | 2 +- Rest.Net/RestJavascriptClientGenerator.cs | 82 +++++++++++++++++++---- 2 files changed, 71 insertions(+), 13 deletions(-) diff --git a/Rest.Net/Rest.Net.csproj b/Rest.Net/Rest.Net.csproj index d43320c..dc5de9d 100644 --- a/Rest.Net/Rest.Net.csproj +++ b/Rest.Net/Rest.Net.csproj @@ -17,7 +17,7 @@ MontoyaTech.Rest.Net MontoyaTech.Rest.Net True - 1.8.2 + 1.8.3 Logo_Symbol_Black_Outline.png diff --git a/Rest.Net/RestJavascriptClientGenerator.cs b/Rest.Net/RestJavascriptClientGenerator.cs index f8bba0a..98b085d 100644 --- a/Rest.Net/RestJavascriptClientGenerator.cs +++ b/Rest.Net/RestJavascriptClientGenerator.cs @@ -237,6 +237,64 @@ namespace MontoyaTech.Rest.Net return base.GetTypeDefaultValue(type); } + protected internal string EscapeName(string name) + { + if (name != null) + { + switch (name) + { + case "arguments": + case "await": + case "break": + case "case": + case "catch": + case "class": + case "const": + case "continue": + case "debugger": + case "default": + case "delete": + case "do": + case "double": + case "else": + case "enum": + case "eval": + case "export": + case "extends": + case "false": + case "finally": + case "for": + case "function": + case "goto": + case "if": + case "import": + case "in": + case "instanceof": + case "interface": + case "let": + case "new": + case "null": + case "return": + case "static": + case "super": + case "switch": + case "this": + case "throw": + case "true": + case "try": + case "typeof": + case "var": + case "void": + case "while": + case "with": + case "yield": + return "_" + name; + } + } + + return name; + } + protected internal virtual void GenerateJavascriptIncludedTypes(List types, CodeWriter writer) { foreach (var type in types) @@ -293,18 +351,18 @@ namespace MontoyaTech.Rest.Net foreach (var field in fields) { if (this.UseJsonNames) - writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {(field.GetCustomAttribute()?.PropertyName ?? field.Name)}"); + writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {EscapeName(field.GetCustomAttribute()?.PropertyName ?? field.Name)}"); else - writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {field.Name}"); + writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {EscapeName(field.Name)}"); } //Document the properties foreach (var property in properties) { if (this.UseJsonNames) - writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {(property.GetCustomAttribute()?.PropertyName ?? property.Name)}"); + writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {EscapeName(property.GetCustomAttribute()?.PropertyName ?? property.Name)}"); else - writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {property.Name}"); + writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {EscapeName(property.Name)}"); } writer.Outdent().WriteLine("*/"); @@ -314,18 +372,18 @@ namespace MontoyaTech.Rest.Net foreach (var field in fields) { if (this.UseJsonNames) - writer.WriteSeparator().Write(field.GetCustomAttribute()?.PropertyName ?? field.Name).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType)); + writer.WriteSeparator().Write(EscapeName(field.GetCustomAttribute()?.PropertyName ?? field.Name)).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType)); else - writer.WriteSeparator().Write(field.Name).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType)); + writer.WriteSeparator().Write(EscapeName(field.Name)).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType)); } //Write the default properties foreach (var property in properties) { if (this.UseJsonNames) - writer.WriteSeparator().Write(property.GetCustomAttribute()?.PropertyName ?? property.Name).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType)); + writer.WriteSeparator().Write(EscapeName(property.GetCustomAttribute()?.PropertyName ?? property.Name)).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType)); else - writer.WriteSeparator().Write(property.Name).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType)); + writer.WriteSeparator().Write(EscapeName(property.Name)).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType)); } writer.WriteLine(") {").Indent(); @@ -334,18 +392,18 @@ namespace MontoyaTech.Rest.Net foreach (var field in fields) { if (this.UseJsonNames) - writer.Write("this.").Write(field.GetCustomAttribute()?.PropertyName ?? field.Name).Write(" = ").Write(field.GetCustomAttribute()?.PropertyName ?? field.Name).WriteLine(";"); + writer.Write("this.").Write(field.GetCustomAttribute()?.PropertyName ?? field.Name).Write(" = ").Write(EscapeName(field.GetCustomAttribute()?.PropertyName ?? field.Name)).WriteLine(";"); else - writer.Write("this.").Write(field.Name).Write(" = ").Write(field.Name).WriteLine(";"); + writer.Write("this.").Write(field.Name).Write(" = ").Write(EscapeName(field.Name)).WriteLine(";"); } //Init the default properties foreach (var property in properties) { if (this.UseJsonNames) - writer.Write("this.").Write(property.GetCustomAttribute()?.PropertyName ?? property.Name).Write(" = ").Write(property.GetCustomAttribute()?.PropertyName ?? property.Name).WriteLine(";"); + writer.Write("this.").Write(property.GetCustomAttribute()?.PropertyName ?? property.Name).Write(" = ").Write(EscapeName(property.GetCustomAttribute()?.PropertyName ?? property.Name)).WriteLine(";"); else - writer.Write("this.").Write(property.Name).Write(" = ").Write(property.Name).WriteLine(";"); + writer.Write("this.").Write(property.Name).Write(" = ").Write(EscapeName(property.Name)).WriteLine(";"); } writer.Outdent().WriteLine("}");