Fix issue where a message has multiple oneof fields

Makefile

@@ -111,13 +111,13 @@ integration-test-server: tools ## Generates the server dependencies used by the
 		--grpc-gateway_opt paths=source_relative \
 		--grpc-gateway_opt generate_unbound_methods=true \
 		--grpc-gateway_opt logtostderr=true \
-		--grpc-gateway_opt generate_unbound_methods=true \
 		--openapiv2_out ./test/integration/tmp/openapiv2 \
 		--openapiv2_opt logtostderr=true \
 		--openapiv2_opt use_go_templates=true \
 		--openapiv2_opt simple_operation_ids=true \
 		--openapiv2_opt openapi_naming_strategy=fqn \
 		--openapiv2_opt disable_default_errors=true \
+		--openapiv2_opt generate_unbound_methods=true \
 		service.proto msg.proto
 
 .PHONY: tools

generator/service.ts.tmpl

@@ -96,8 +96,8 @@ export type {{.Name}} = Base{{.Name}}
     {{end -}}
     {{fieldName $field.Name}}: {{tsType $field}};
 {{- end}}
-  }>;
-{{- end -}}
+  }>
+{{- end -}};
 
 {{/* Standard, non oneof messages */}}
 

generator/template.go

@@ -111,7 +111,6 @@ func renderURL(r *registry.Registry) func(method data.Method) string {
 				methodURL += "?" + renderURLSearchParamsFn
 			}
 		}
-
 		return methodURL
 	}
 }

test/integration/noStaticClasses/noStaticClasses_test.ts

@@ -10,14 +10,20 @@ import { b64Decode } from "./fetch.pb";
 
 describe("test static functions", () => {
   it("unary request", async () => {
-    const result = await increment({ counter: 199 });
+    const result = await increment(
+      { counter: 199 },
+      { pathPrefix: "http://localhost:8081" }
+    );
 
     expect(result.result).to.equal(200);
   });
 
   it("failing unary request", async () => {
     try {
-      await failingIncrement({ counter: 199 });
+      await failingIncrement(
+        { counter: 199 },
+        { pathPrefix: "http://localhost:8081" }
+      );
       expect.fail("expected call to throw");
     } catch (e) {
       expect(e).to.have.property("message", "this increment does not work");
@@ -27,8 +33,10 @@ describe("test static functions", () => {
 
   it("streaming request", async () => {
     const response = [] as number[];
-    await streamingIncrements({ counter: 1 }, (resp) =>
-      response.push(resp.result)
+    await streamingIncrements(
+      { counter: 1 },
+      (resp) => response.push(resp.result),
+      { pathPrefix: "http://localhost:8081" }
     );
     expect(response).to.deep.equal([2, 3, 4, 5, 6]);
   });