From f5cebbb00b75c96905dfb6de151969ac221b7329 Mon Sep 17 00:00:00 2001
From: "K.Himeno" <6715229+Himenon@users.noreply.github.com>
Date: Mon, 20 Mar 2023 23:56:08 +0900
Subject: [PATCH 1/2] fix: export type

---
 .../ClientTypeDefinition.ts                   | 23 +++++++++++++------
 .../functional-api-client/index.ts            |  5 +++-
 src/meta.ts                                   |  2 +-
 .../__snapshots__/argo-rollout-test.ts.snap   |  3 ++-
 .../__snapshots__/format.domain.ts.snap       |  3 ++-
 .../__snapshots__/kubernetes-test.ts.snap     |  3 ++-
 .../multi-type.test.domain.ts.snap            |  3 ++-
 .../__snapshots__/spit-code-test.ts.snap      |  3 ++-
 .../__snapshots__/template-only-test.ts.snap  |  9 +++++---
 .../typedef-with-template-test.ts.snap        | 18 ++++++++++-----
 .../unknown-schema-domain-test.ts.snap        |  3 ++-
 11 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
index b80ff55c..d202f8a5 100644
--- a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
+++ b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
@@ -1,11 +1,20 @@
+import ts from "typescript";
 import type { TsGenerator } from "../../../api";
 
-export const create = (factory: TsGenerator.Factory.Type) => {
-  return factory.TypeAliasDeclaration.create({
-    export: true,
-    name: "Client",
-    type: factory.TypeReferenceNode.create({
-      name: `ReturnType<typeof createClient>`,
+export const create = (factory: TsGenerator.Factory.Type): ts.TypeAliasDeclaration[] => {
+  return [
+    factory.TypeAliasDeclaration.create({
+      name: "ClientFunction<RequestOption>",
+      type: factory.TypeReferenceNode.create({
+        name: `typeof createClient<RequestOption>`,
+      })
+    }),
+    factory.TypeAliasDeclaration.create({
+      export: true,
+      name: "Client<RequestOption>",
+      type: factory.TypeReferenceNode.create({
+        name: `ReturnType<ClientFunction<RequestOption>>`,
+      })
     })
-  })
+  ]
 };
diff --git a/src/code-templates/functional-api-client/index.ts b/src/code-templates/functional-api-client/index.ts
index a45ad3bf..0164141e 100644
--- a/src/code-templates/functional-api-client/index.ts
+++ b/src/code-templates/functional-api-client/index.ts
@@ -37,6 +37,9 @@ export const generator: CodeGenerator.GenerateFunction<Option> = (
 
   const apiClientStatement = FunctionalApiClient.create(factory, codeGeneratorParamsList, option || {});
   statements.push(apiClientStatement);
-  statements.push(ClientTypeDefinition.create(factory));
+  ClientTypeDefinition.create(factory).forEach(statement => {
+    statements.push(statement);
+  })
+  
   return statements;
 };
diff --git a/src/meta.ts b/src/meta.ts
index 04e02a68..97feba1f 100644
--- a/src/meta.ts
+++ b/src/meta.ts
@@ -1,2 +1,2 @@
 export const Name = "@himenon/openapi-typescript-code-generator";
-export const Version = "0.22.0";
\ No newline at end of file
+export const Version = "0.22.1";
\ No newline at end of file
diff --git a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
index 670458d8..5d13d20c 100644
--- a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
@@ -3923,6 +3923,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/format.domain.ts.snap b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
index 39a52a0f..faadf073 100644
--- a/test/__tests__/functional/__snapshots__/format.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
@@ -49,6 +49,7 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
index fa431c31..18ecbf08 100644
--- a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
@@ -56556,6 +56556,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
index 07b5bd58..75857dd7 100644
--- a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
@@ -71,7 +71,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
index d1a9f350..f19fffe3 100644
--- a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
@@ -230,7 +230,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
index 84c9d1a3..d4f78d42 100644
--- a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
@@ -135,7 +135,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -274,7 +275,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -308,6 +310,7 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
index 603a90a9..82b8d03c 100644
--- a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
@@ -484,7 +484,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -548,7 +549,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1036,7 +1038,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1093,7 +1096,8 @@ export interface ApiClient<RequestOption> {
 export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>, baseUrl: string) => {
     return {};
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1231,7 +1235,8 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1377,6 +1382,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
index f182363c..ea5b16e4 100644
--- a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
@@ -55,6 +55,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
         }
     };
 };
-export type Client = ReturnType<typeof createClient>;
+type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
+export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
 "
 `;

From 89ac737f41a929f2b015c9251cc54bfef406a011 Mon Sep 17 00:00:00 2001
From: "K.Himeno" <6715229+Himenon@users.noreply.github.com>
Date: Mon, 20 Mar 2023 23:59:30 +0900
Subject: [PATCH 2/2] fix: export type

---
 .../__snapshots__/argo-rollout-test.ts.snap          |  2 +-
 .../functional/__snapshots__/format.domain.ts.snap   |  2 +-
 .../functional/__snapshots__/kubernetes-test.ts.snap |  2 +-
 .../__snapshots__/multi-type.test.domain.ts.snap     |  2 +-
 .../functional/__snapshots__/spit-code-test.ts.snap  |  2 +-
 .../__snapshots__/template-only-test.ts.snap         |  6 +++---
 .../__snapshots__/typedef-with-template-test.ts.snap | 12 ++++++------
 .../__snapshots__/unknown-schema-domain-test.ts.snap |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
index 5d13d20c..f9326879 100644
--- a/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/argo-rollout-test.ts.snap
@@ -3924,6 +3924,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/format.domain.ts.snap b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
index faadf073..e20d7112 100644
--- a/test/__tests__/functional/__snapshots__/format.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/format.domain.ts.snap
@@ -50,6 +50,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     return {};
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
index 18ecbf08..5d46629f 100644
--- a/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/kubernetes-test.ts.snap
@@ -56557,6 +56557,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
index 75857dd7..58af2397 100644
--- a/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
+++ b/test/__tests__/functional/__snapshots__/multi-type.test.domain.ts.snap
@@ -72,7 +72,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
index f19fffe3..9898a7f2 100644
--- a/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/spit-code-test.ts.snap
@@ -231,7 +231,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
diff --git a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
index d4f78d42..f0b00a10 100644
--- a/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/template-only-test.ts.snap
@@ -136,7 +136,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -276,7 +276,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -311,6 +311,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     return {};
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
index 82b8d03c..51152381 100644
--- a/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/typedef-with-template-test.ts.snap
@@ -485,7 +485,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -550,7 +550,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1039,7 +1039,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1097,7 +1097,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     return {};
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1236,7 +1236,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
 
@@ -1383,6 +1383,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;
diff --git a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
index ea5b16e4..dd04c58f 100644
--- a/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
+++ b/test/__tests__/functional/__snapshots__/unknown-schema-domain-test.ts.snap
@@ -56,6 +56,6 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
     };
 };
 type ClientFunction<RequestOption> = typeof createClient<RequestOption>;
-export type Client<RequestOption> = ReturnType<<ClientFunction<RequestOption>>;
+export type Client<RequestOption> = ReturnType<ClientFunction<RequestOption>>;
 "
 `;