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

Bumped package version to 1.8.1. Javascript client now includes a urlHandler and requestHandler that can be used to modify the request before it's sent.

Browse Source
This commit is contained in:
MattMo 2024-02-19 08:42:58 -08:00
parent 8747b5fb3e
commit cc83f99612
2 changed files with 62 additions and 36 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>
<RootNamespace>MontoyaTech.Rest.Net</RootNamespace>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Version>1.8.0</Version>
<Version>1.8.1</Version>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageIcon>Logo_Symbol_Black_Outline.png</PackageIcon>
</PropertyGroup>

96
Rest.Net/RestJavascriptClientGenerator.cs
View File

@ -38,27 +38,16 @@ namespace MontoyaTech.Rest.Net
writer.WriteBreak().WriteLine($"class {this.ClientName} {{").Indent();
//Create the base url field
if (this.StaticCode)
{
writer.WriteBreak().WriteLine("/** @type {string} */");
writer.WriteLine("static BaseUrl = null;");
}
else
{
writer.WriteBreak().WriteLine("/** @type {string} */");
writer.WriteLine("BaseUrl = null;");
}
writer.WriteBreak().WriteLine("/** @type {string} */");
writer.WriteAssert(this.StaticCode, "static ").WriteLine("BaseUrl = null;");
//Create the url handler field
writer.WriteBreak().WriteLine("/** @type {Function} */");
writer.WriteAssert(this.StaticCode, "static ").WriteLine("UrlHandler = null;");
//Create the request handler field.
if (this.StaticCode)
{
writer.WriteBreak().WriteLine("/** @type {Function} */");
}
else
{
writer.WriteBreak().WriteLine("/** @type {Function} */");
}
writer.WriteBreak().WriteLine("/** @type {Function} */");
writer.WriteAssert(this.StaticCode, "static ").WriteLine("RequestHandler = null;");
//Create fields foreach route group so they can be accessed.
if (!this.StaticCode)
@ -73,12 +62,13 @@ namespace MontoyaTech.Rest.Net
//Create the client constructor or init method
if (this.StaticCode)
{
writer.WriteBreak().WriteLine("/**").Indent();
writer.WriteLine("Initializes the api client with a given baseUrl of where to send requests.");
writer.WriteLine("@param {string} baseUrl");
writer.WriteLine("Initializes this api client with a given baseUrl of where to send requests.");
writer.WriteLine("@param {string} baseUrl Base url of the server to make requests against.");
writer.WriteLine("@param {Function} urlHandler An optional function to process request urls before they are sent. This must return the url.");
writer.WriteLine("@param {Function} requestHandler An optional function to process requests before they are sent. This must return the request.");
writer.Outdent().WriteLine("*/");
writer.Write("static Init(baseUrl, requestHandler) ").WriteLine("{").Indent();
writer.Write("static Init(baseUrl, urlHandler = null, requestHandler = null) ").WriteLine("{").Indent();
//Make sure the baseUrl isn't null or whitespace
writer.WriteBreak().WriteLine("if (baseUrl == null || baseUrl == undefined || baseUrl.trim() == '') {").Indent();
@ -93,12 +83,23 @@ namespace MontoyaTech.Rest.Net
//Store the baseUrl
writer.WriteBreak().WriteLine($"{this.ClientName}.BaseUrl = baseUrl;");
//Store the urlHandler
writer.WriteBreak().WriteLine($"{this.ClientName}.UrlHandler = urlHandler;");
//Store the requestHandler
writer.WriteBreak().WriteLine($"{this.ClientName}.RequestHandler = requestHandler;");
writer.Outdent().WriteLine("}");
}
else
{
writer.WriteBreak().WriteLine("/** @param {string} baseUrl */");
writer.Write("constructor(baseUrl) ").WriteLine("{").Indent();
writer.WriteBreak().WriteLine("/**").Indent();
writer.WriteLine("Initializes this api client with a given baseUrl of where to send requests.");
writer.WriteLine("@param {string} baseUrl Base url of the server to make requests against.");
writer.WriteLine("@param {Function} urlHandler An optional function to process request urls before they are sent. This must return the url.");
writer.WriteLine("@param {Function} requestHandler An optional function to process requests before they are sent. This must return the request.");
writer.Outdent().WriteLine("*/");
writer.Write("constructor(baseUrl, urlHandler = null, requestHandler = null) ").WriteLine("{").Indent();
//Make sure the baseUrl isn't null or whitespace
writer.WriteBreak().WriteLine("if (baseUrl == null || baseUrl == undefined || baseUrl.trim() == '') {").Indent();
@ -113,8 +114,15 @@ namespace MontoyaTech.Rest.Net
//Store the baseUrl
writer.WriteBreak().WriteLine("this.BaseUrl = baseUrl;");
//Store the urlHandler
writer.WriteBreak().WriteLine($"this.UrlHandler = urlHandler;");
//Store the request handler
writer.WriteBreak().WriteLine("this.RequestHandler = requestHandler;");
//Init all the route group fields
writer.WriteBreak();
foreach (var group in routeGroups)
writer.WriteLine($"this.{group.Key} = new {group.Key}Api(this);");
@ -547,15 +555,14 @@ namespace MontoyaTech.Rest.Net
writer.WriteLine(") {").Indent();
//Generate function body
writer.WriteLine("var response = await fetch(").Indent();
//Generate the url
writer.WriteBreak().Write("var url = ");
//Generate the request url
if (this.StaticCode)
writer.WriteSeparator().Write('`').Write($"${{{this.ClientName}.BaseUrl}}");
writer.Write('`').Write($"${{{this.ClientName}.BaseUrl}}");
else
writer.WriteSeparator().Write('`').Write("${this.Client.BaseUrl}");
writer.Write('`').Write("${this.Client.BaseUrl}");
//Reconstruct the route syntax into a request url.
var components = route.Syntax.Split('/');
@ -586,7 +593,10 @@ namespace MontoyaTech.Rest.Net
}
}
writer.WriteLine("`, {").Indent();
writer.WriteLine("`;");
//Generate the request
writer.WriteBreak().WriteLine("var request = {").Indent();
//Include credentials
writer.WriteLine("credentials: 'include',");
@ -613,10 +623,26 @@ namespace MontoyaTech.Rest.Net
}
}
writer.Outdent().WriteLine("}");
writer.Outdent().WriteLine("};");
writer.Outdent().WriteLine(");");
//Generate the response
writer.WriteBreak().Write("var response = await fetch(");
if (this.StaticCode)
writer.Write($"{this.ClientName}.UrlHandler ? {this.ClientName}.UrlHandler(url) : url");
else
writer.Write($"this.Client.UrlHandler ? this.Client.UrlHandler(url) : url");
writer.WriteSeparator();
if (this.StaticCode)
writer.Write($"{this.ClientName}.RequestHandler ? {this.ClientName}.RequestHandler(request) : request");
else
writer.Write("this.Client.RequestHandler ? this.Client.RequestHandler(request) : request");
writer.WriteLine(");");
//Generate code to handle the response
if (routeResponse != null)
{
writer.WriteBreak().WriteLine("if (response.ok) {").Indent();
@ -678,9 +704,9 @@ namespace MontoyaTech.Rest.Net
}
}
writer.Outdent().WriteLine("} else {").Indent();
writer.WriteLine("throw response;");
writer.Outdent().WriteLine("}");
writer.WriteBreak().WriteLine("throw response;");
}
else
{