clientgen: more idiomatic empty return (encoredev#1362)

erikcarlsson · Sep 4, 2024 · 299686f · 299686f
1 parent bfa1ee2
commit 299686f
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 46 deletions.
diff --git a/e2e-tests/testdata/echo_client/js/client.js b/e2e-tests/testdata/echo_client/js/client.js
@@ -776,7 +776,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/e2e-tests/testdata/echo_client/ts/client.ts b/e2e-tests/testdata/echo_client/ts/client.ts
@@ -859,10 +859,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -892,10 +892,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -1026,7 +1026,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/javascript.go b/internal/clientgen/javascript.go
@@ -841,7 +841,7 @@ class BaseClient {`)
         }`)
 	}
 	js.WriteString(`
-        return;
+        return undefined;
     }
 `)
 

diff --git a/internal/clientgen/testdata/goapp/expected_baseauth_javascript.js b/internal/clientgen/testdata/goapp/expected_baseauth_javascript.js
@@ -316,7 +316,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/goapp/expected_baseauth_typescript.ts b/internal/clientgen/testdata/goapp/expected_baseauth_typescript.ts
@@ -227,10 +227,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -260,10 +260,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -389,7 +389,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/goapp/expected_javascript.js b/internal/clientgen/testdata/goapp/expected_javascript.js
@@ -499,7 +499,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/goapp/expected_noauth_javascript.js b/internal/clientgen/testdata/goapp/expected_noauth_javascript.js
@@ -269,7 +269,7 @@ class BaseClient {
     }
 
     async getAuthData() {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/goapp/expected_noauth_typescript.ts b/internal/clientgen/testdata/goapp/expected_noauth_typescript.ts
@@ -195,10 +195,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -228,10 +228,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -320,7 +320,7 @@ class BaseClient {
     }
 
     async getAuthData(): Promise<CallParameters | undefined> {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/goapp/expected_typescript.ts b/internal/clientgen/testdata/goapp/expected_typescript.ts
@@ -558,10 +558,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -591,10 +591,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -720,7 +720,7 @@ class BaseClient {
 
             return data;
         }
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_javascript.js b/internal/clientgen/testdata/tsapp/expected_javascript.js
@@ -283,7 +283,7 @@ class BaseClient {
     }
 
     async getAuthData() {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_list_of_union_javascript.js b/internal/clientgen/testdata/tsapp/expected_list_of_union_javascript.js
@@ -271,7 +271,7 @@ class BaseClient {
     }
 
     async getAuthData() {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_list_of_union_typescript.ts b/internal/clientgen/testdata/tsapp/expected_list_of_union_typescript.ts
@@ -197,10 +197,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -230,10 +230,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -322,7 +322,7 @@ class BaseClient {
     }
 
     async getAuthData(): Promise<CallParameters | undefined> {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_stream_javascript.js b/internal/clientgen/testdata/tsapp/expected_stream_javascript.js
@@ -340,7 +340,7 @@ class BaseClient {
     }
 
     async getAuthData() {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_stream_typescript.ts b/internal/clientgen/testdata/tsapp/expected_stream_typescript.ts
@@ -312,10 +312,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -345,10 +345,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -437,7 +437,7 @@ class BaseClient {
     }
 
     async getAuthData(): Promise<CallParameters | undefined> {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/testdata/tsapp/expected_typescript.ts b/internal/clientgen/testdata/tsapp/expected_typescript.ts
@@ -222,10 +222,10 @@ export class StreamInOut<Request, Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -255,10 +255,10 @@ export class StreamIn<Response> {
 
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -347,7 +347,7 @@ class BaseClient {
     }
 
     async getAuthData(): Promise<CallParameters | undefined> {
-        return;
+        return undefined;
     }
 
     // createStreamInOut sets up a stream to a streaming API endpoint.

diff --git a/internal/clientgen/typescript.go b/internal/clientgen/typescript.go
@@ -676,10 +676,10 @@ func (ts *typescript) writeStreamClasses() {
 	receive := `
     async next(): Promise<Response | undefined> {
         for await (const next of this) return next;
-        return;
+        return undefined;
     }
 
-    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void>{
+    async *[Symbol.asyncIterator](): AsyncGenerator<Response, undefined, void> {
         while (true) {
             if (this.buffer.length > 0) {
                 yield this.buffer.shift() as Response;
@@ -1108,7 +1108,7 @@ class BaseClient {
 	}
 
 	ts.WriteString(`
-        return;
+        return undefined;
     }
 `)
-Original file line number
+Diff line change
@@ Expand Up / @@ -776,7 +776,7 @@ class BaseClient { @@
                 return data;
             }
-            return;
+            return undefined;
         }
         // createStreamInOut sets up a stream to a streaming API endpoint.
@@ Expand Down @@