[Javascript] v1.0.5

klee-contrib · Sep 6, 2024 · 0a87527 · 0a87527
1 parent 6ce6def
commit 0a87527
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/TopModel.Generator.Javascript/AngularApiClientGenerator.cs b/TopModel.Generator.Javascript/AngularApiClientGenerator.cs
@@ -206,15 +206,14 @@ private void WriteEndpoint(Endpoint endpoint, FileWriter fw)
             fw.WriteLine();
         }
 
-        if (returnType == "string" || returnType == "Blob" || returnType == "ArrayBuffer")
+        var needResponseType = returnType == "string" || returnType == "Blob" || returnType == "ArrayBuffer";
+        var getter = $"this.http.{endpoint.Method.ToLower()}<{returnType}>";
+        if (needResponseType)
         {
-              fw.Write(2, $@"return {(Config.ApiMode == TargetFramework.ANGULAR_PROMISE ? "lastValueFrom(" : string.Empty)}this.http.{endpoint.Method.ToLower()}(`/{fullRoute}`");
-        }
-        else
-        {
-            fw.Write(2, $@"return {(Config.ApiMode == TargetFramework.ANGULAR_PROMISE ? "lastValueFrom(" : string.Empty)}this.http.{endpoint.Method.ToLower()}<{returnType}>(`/{fullRoute}`");
+            getter = $"{endpoint.Method.ToLower()}(`/{fullRoute}`";
         }
 
+        fw.Write(2, $@"return {(Config.ApiMode == TargetFramework.ANGULAR_PROMISE ? "lastValueFrom(" : string.Empty)}this.http.{getter}(`/{fullRoute}`");
         if (endpoint.GetJsonBodyParam() != null)
         {
             fw.Write($", {endpoint.GetJsonBodyParam()!.GetParamName()}");
@@ -228,9 +227,10 @@ private void WriteEndpoint(Endpoint endpoint, FileWriter fw)
             fw.Write(", {}");
         }
 
-        if (returnType == "string" || returnType == "Blob" || returnType == "ArrayBuffer")
+        if (needResponseType)
         {
-          fw.Write($", {{responseType: '{returnType.ToLower()}'}}");
+            var responseType = returnType == "string" ? "text" : returnType.ToLower();
+            fw.Write($", {{responseType: '{returnType.ToLower()}'}}");
         }
 
         if (endpoint.GetQueryParams().Any())

diff --git a/TopModel.Generator.Javascript/CHANGELOG.md b/TopModel.Generator.Javascript/CHANGELOG.md
@@ -1,4 +1,8 @@
 
+## 1.0.5
+
+- [#389](https://github.com/klee-contrib/topmodel/pull/389) - Prise en compte des returnType Blob et ArrayBuffer Hot fix
+
 ## 1.0.4
 
 - [#389](https://github.com/klee-contrib/topmodel/pull/389) - Prise en compte des returnType Blob et ArrayBuffer

diff --git a/TopModel.Generator.Javascript/TopModel.Generator.Javascript.csproj b/TopModel.Generator.Javascript/TopModel.Generator.Javascript.csproj
@@ -10,7 +10,7 @@
 
   <PropertyGroup>
     <PackageOutputPath>../.nupkg</PackageOutputPath>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <Authors>JabX;gideruette</Authors>
     <Description>Générateurs JS/TS pour TopModel</Description>