review comments: move undefined type to the end

encoredev · Feb 12, 2024 · 8d28ed9 · 8d28ed9
1 parent ab06d3d
commit 8d28ed9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/e2e-tests/testdata/echo_client/ts/client.ts b/e2e-tests/testdata/echo_client/ts/client.ts
@@ -782,8 +782,8 @@ type CallParameters = Omit<RequestInit, "method" | "body" | "headers"> & {
 // AuthDataGenerator is a function that returns a new instance of the authentication data required by this API
 export type AuthDataGenerator = () =>
   | echo.AuthParams
-  | undefined
-  | Promise<echo.AuthParams | undefined>;
+  | Promise<echo.AuthParams | undefined>
+  | undefined;
 
 // A fetcher is the prototype for the inbuilt Fetch function
 export type Fetcher = typeof fetch;

diff --git a/internal/clientgen/testdata/expected_baseauth_typescript.ts b/internal/clientgen/testdata/expected_baseauth_typescript.ts
@@ -150,8 +150,8 @@ type CallParameters = Omit<RequestInit, "method" | "body" | "headers"> & {
 // AuthDataGenerator is a function that returns a new instance of the authentication data required by this API
 export type AuthDataGenerator = () =>
   | string
-  | undefined
-  | Promise<string | undefined>;
+  | Promise<string | undefined>
+  | undefined;
 
 // A fetcher is the prototype for the inbuilt Fetch function
 export type Fetcher = typeof fetch;

diff --git a/internal/clientgen/testdata/expected_typescript.ts b/internal/clientgen/testdata/expected_typescript.ts
@@ -442,8 +442,8 @@ type CallParameters = Omit<RequestInit, "method" | "body" | "headers"> & {
 // AuthDataGenerator is a function that returns a new instance of the authentication data required by this API
 export type AuthDataGenerator = () =>
   | authentication.AuthData
-  | undefined
-  | Promise<authentication.AuthData | undefined>;
+  | Promise<authentication.AuthData | undefined>
+  | undefined;
 
 // A fetcher is the prototype for the inbuilt Fetch function
 export type Fetcher = typeof fetch;

diff --git a/internal/clientgen/typescript.go b/internal/clientgen/typescript.go
@@ -675,10 +675,10 @@ export type AuthDataGenerator = () =>
   | `)
 		ts.writeTyp("", ts.md.AuthHandler.Params, 0)
 		ts.WriteString(`
-  | undefined
   | Promise<`)
 		ts.writeTyp("", ts.md.AuthHandler.Params, 0)
-		ts.WriteString(` | undefined>;`)
+		ts.WriteString(` | undefined>
+  | undefined;`)
 	}
 
 	ts.WriteString(`