- TS codegen improvements.

- Minor version bump.
vaccovecrana · Jun 9, 2024 · 1d0ee9f · 1d0ee9f
1 parent 777e0b9
commit 1d0ee9f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins { id("io.vacco.oss.gitflow") version "0.9.8" apply(false) }
 subprojects {
   apply(plugin = "io.vacco.oss.gitflow")
   group = "io.vacco.ronove"
-  version = "1.2.5"
+  version = "1.2.6"
 
   configure<io.vacco.oss.gitflow.GsPluginProfileExtension> {
     addJ8Spec()

diff --git a/rv-gradle-plugin/src/main/java/io/vacco/ronove/plugin/RvTsGen.java b/rv-gradle-plugin/src/main/java/io/vacco/ronove/plugin/RvTsGen.java
@@ -35,7 +35,13 @@ public String render(List<Class<?>> controllers) {
     context.set("retFn", (Function<Type, String>) RvTsDeclarations::mapReturn);
     context.set("paramFn", (Function<RvDescriptor, String>) RvTsDeclarations::mapParams);
 
-    return template.render(context);
+    var out = template.render(context);
+    out = Arrays.stream(out.split("\n"))
+      .filter(line -> !"  ".equals(line))
+      .filter(line -> !"    ".equals(line))
+      .collect(Collectors.joining("\n"));
+
+    return out;
   }
 
 }
diff --git a/rv-gradle-plugin/src/main/resources/io/vacco/ronove/codegen/rv-ts-rpc.bt b/rv-gradle-plugin/src/main/resources/io/vacco/ronove/codegen/rv-ts-rpc.bt
@@ -42,26 +42,28 @@ Source controllers:
 export const {{rvd.javaMethod.getName()}} = ({{paramFn.apply(rvd)}}): Promise<{{retFn.apply(rvd.responseType)}}> => {
   let path = "{{rvd.path.value()}}"
   {{for pp in rvd.pathParams}}
-    path = path.replace("\{ {{pp.name}} \}".replace(/\s+/g, ""), {{pp.name}}.toString()){{"\n  "}}
+  path = path.replace("\{ {{pp.name}} \}".replace(/\s+/g, ""), {{pp.name}}.toString()){{"\n  "}}
   {{end}}
   {{if !rvd.queryParams.isEmpty()}}
-    const qParams = new URLSearchParams()
-    {{for qp in rvd.queryParams}}
-      qParams.append("{{qp.name}}", {{qp.name}}.toString()){{"\n  "}}
-    {{end}}
-    path = `${path}?${qParams.toString()}`
+  const qParams = new URLSearchParams()
+  {{for qp in rvd.queryParams}}
+  if ({{qp.name}}) {
+    qParams.append("{{qp.name}}", {{qp.name}}.toString())
+  }
+  {{end}}
+  path = `${path}?${qParams.toString()}`
   {{end}}
   {{if !rvd.headerParams.isEmpty()}}
-    const headers = new Map<string, string>()
-    {{for hp in rvd.headerParams}}
-      headers.set("{{hp.name}}", {{hp.name}}){{"\n  "}}
-    {{end}}
+  const headers = new Map<string, string>()
+  {{for hp in rvd.headerParams}}
+  headers.set("{{hp.name}}", {{hp.name}}){{"\n  "}}
+  {{end}}
   {{end}}
   {{if !rvd.formParams.isEmpty()}}
-    const formData = new FormData();
-    {{for fp in rvd.formParams}}
-      formData.append("{{fp.name}}", {{fp.name}});
-    {{end}}
+  const formData = new FormData();
+  {{for fp in rvd.formParams}}
+  formData.append("{{fp.name}}", {{fp.name}});
+  {{end}}
   {{end}}
   return doJsonIo(path, "{{rvd.httpMethodTxt}}",
     {{if rvd.beanParam != null}}