MontoyaTech/Rest.Net
MontoyaTech/Rest.Net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bumped package version to 1.8.3. Added code to escape the names of fields, properties when generating the constructor.

Browse Source
This commit is contained in:
MattMo 2024-02-23 16:55:40 -08:00
parent b8e8e1dd86
commit 51b8ba073c
2 changed files with 71 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rest.Net/Rest.Net.csproj
View File

@ -17,7 +17,7 @@
<AssemblyName>MontoyaTech.Rest.Net</AssemblyName> <AssemblyName>MontoyaTech.Rest.Net</AssemblyName>
<RootNamespace>MontoyaTech.Rest.Net</RootNamespace> <RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>1.8.2</Version> <Version>1.8.3</Version>
<PackageReleaseNotes></PackageReleaseNotes> <PackageReleaseNotes></PackageReleaseNotes>
<PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon> <PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon>
</PropertyGroup> </PropertyGroup>

82
Rest.Net/RestJavascriptClientGenerator.cs
View File

@ -237,6 +237,64 @@ namespace MontoyaTech.Rest.Net
return base.GetTypeDefaultValue(type); 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<Type> types, CodeWriter writer) protected internal virtual void GenerateJavascriptIncludedTypes(List<Type> types, CodeWriter writer)
{ {
foreach (var type in types) foreach (var type in types)
@ -293,18 +351,18 @@ namespace MontoyaTech.Rest.Net
foreach (var field in fields) foreach (var field in fields)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name)}"); writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {EscapeName(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name)}");
else else
writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {field.Name}"); writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(field.FieldType)}}} {EscapeName(field.Name)}");
} }
//Document the properties //Document the properties
foreach (var property in properties) foreach (var property in properties)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name)}"); writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {EscapeName(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name)}");
else else
writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {property.Name}"); writer.WriteLine($"@param {{{this.GetTypeFullyResolvedName(property.PropertyType)}}} {EscapeName(property.Name)}");
} }
writer.Outdent().WriteLine("*/"); writer.Outdent().WriteLine("*/");
@ -314,18 +372,18 @@ namespace MontoyaTech.Rest.Net
foreach (var field in fields) foreach (var field in fields)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.WriteSeparator().Write(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType)); writer.WriteSeparator().Write(EscapeName(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name)).Write(" = ").Write(this.GetTypeDefaultValue(field.FieldType));
else 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 //Write the default properties
foreach (var property in properties) foreach (var property in properties)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.WriteSeparator().Write(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType)); writer.WriteSeparator().Write(EscapeName(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name)).Write(" = ").Write(this.GetTypeDefaultValue(property.PropertyType));
else 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(); writer.WriteLine(") {").Indent();
@ -334,18 +392,18 @@ namespace MontoyaTech.Rest.Net
foreach (var field in fields) foreach (var field in fields)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.Write("this.").Write(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name).Write(" = ").Write(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name).WriteLine(";"); writer.Write("this.").Write(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name).Write(" = ").Write(EscapeName(field.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? field.Name)).WriteLine(";");
else 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 //Init the default properties
foreach (var property in properties) foreach (var property in properties)
{ {
if (this.UseJsonNames) if (this.UseJsonNames)
writer.Write("this.").Write(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name).Write(" = ").Write(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name).WriteLine(";"); writer.Write("this.").Write(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name).Write(" = ").Write(EscapeName(property.GetCustomAttribute<Newtonsoft.Json.JsonPropertyAttribute>()?.PropertyName ?? property.Name)).WriteLine(";");
else 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("}"); writer.Outdent().WriteLine("}");