From a5c233ef57ef9e6969645c1eccb807c42eaa22c7 Mon Sep 17 00:00:00 2001
From: "K.Himeno" <6715229+Himenon@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:13:13 +0900
Subject: [PATCH] style: code format (#128)

---
 examples/apis/client.ts                       |  4 +-
 examples/apis/sample-axios.ts                 |  2 +-
 examples/apis/sample-debug.ts                 |  2 +-
 examples/apis/sample-fetch.ts                 |  2 +-
 examples/apis/sample-superagent.ts            |  2 +-
 examples/readme-sample/ast-code-template.ts   |  2 +-
 .../readme-sample/text-base-code-template.ts  |  2 +-
 .../use-extract-schema-params.ts              |  2 +-
 jest.config.cjs                               |  2 +-
 jest.snapshot.config.cjs                      |  2 +-
 scripts/tools/shell.ts                        |  2 +-
 .../_shared/ApiClientArgument.ts              |  2 +-
 .../_shared/ApiClientInterface.ts             | 14 ++--
 .../_shared/MethodBody/CallRequest.ts         |  2 +-
 .../_shared/MethodBody/PathParameter.ts       |  2 +-
 .../__tests__/PathParameter-test.ts           | 42 +++++------
 .../_shared/MethodBody/index.ts               | 10 +--
 src/code-templates/_shared/utils.ts           | 72 +++++++++----------
 .../class-api-client/ApiClientClass/Method.ts |  2 +-
 .../class-api-client/ApiClientClass/index.ts  |  2 +-
 src/code-templates/class-api-client/index.ts  |  2 +-
 .../CurryingArrowFunction.ts                  |  2 +-
 .../currying-functional-api-client/index.ts   |  2 +-
 .../FunctionalApiClient/ArrowFunction.ts      |  2 +-
 .../ClientTypeDefinition.ts                   |  4 +-
 .../functional-api-client/index.ts            |  2 +-
 src/index.ts                                  |  8 +--
 src/internal/FileSystem/index.ts              | 10 +--
 src/internal/OpenApiTools/Comment.ts          |  2 +-
 src/internal/OpenApiTools/Guard.ts            |  2 +-
 src/internal/OpenApiTools/Parser.ts           |  8 +--
 src/internal/OpenApiTools/TypeNodeContext.ts  | 15 ++--
 src/internal/OpenApiTools/Walker/Store.ts     |  4 +-
 .../OpenApiTools/components/Headers.ts        |  2 +-
 .../OpenApiTools/components/Operation.ts      |  8 +--
 .../OpenApiTools/components/Parameter.ts      |  2 +-
 .../OpenApiTools/components/Parameters.ts     | 51 +++++++------
 .../OpenApiTools/components/PathItem.ts       |  4 +-
 .../OpenApiTools/components/PathItems.ts      |  5 +-
 .../OpenApiTools/components/Reference.ts      |  2 +-
 .../OpenApiTools/components/RequestBodies.ts  |  5 +-
 .../OpenApiTools/components/RequestBody.ts    |  2 +-
 .../OpenApiTools/components/Response.ts       |  4 +-
 .../OpenApiTools/components/Responses.ts      |  2 +-
 .../OpenApiTools/components/Schema.ts         |  2 +-
 .../OpenApiTools/components/Schemas.ts        |  4 +-
 src/internal/OpenApiTools/paths/index.ts      | 10 +--
 src/internal/OpenApiTools/toTypeNode.ts       |  9 ++-
 src/internal/ResolveReference/index.ts        |  6 +-
 src/internal/TsGenerator/factory/index.ts     |  4 +-
 src/internal/TsGenerator/factory/utils.ts     |  4 +-
 src/internal/Validator/index.ts               |  2 +-
 src/typedef/OpenApi.ts                        |  2 +-
 53 files changed, 180 insertions(+), 185 deletions(-)

diff --git a/examples/apis/client.ts b/examples/apis/client.ts
index 7bff5370..0b361059 100644
--- a/examples/apis/client.ts
+++ b/examples/apis/client.ts
@@ -91,7 +91,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
   const _baseUrl = baseUrl.replace(/\/$/, "");
   return {
     getBooks: (option?: RequestOption): Promise<Response$getBooks$Status$200["application/json"]> => {
-      const url = _baseUrl + `/get/books`;
+      const url = `${_baseUrl}/get/books`;
       const headers = {
         Accept: "application/json",
       };
@@ -105,7 +105,7 @@ export const createClient = <RequestOption>(apiClient: ApiClient<RequestOption>,
       );
     },
     searchBooks: (params: Params$searchBooks, option?: RequestOption): Promise<Response$searchBooks$Status$200["application/json"]> => {
-      const url = _baseUrl + `/search/books`;
+      const url = `${_baseUrl}/search/books`;
       const headers = {
         Accept: "application/json",
       };
diff --git a/examples/apis/sample-axios.ts b/examples/apis/sample-axios.ts
index 89f73324..c4d941a2 100644
--- a/examples/apis/sample-axios.ts
+++ b/examples/apis/sample-axios.ts
@@ -33,7 +33,7 @@ const apiClientImpl: ApiClient<RequestOption> = {
     options?: RequestOption,
   ): Promise<any> => {
     const query = generateQueryString(queryParameters);
-    const requestUrl = query ? url + "?" + encodeURI(query) : url;
+    const requestUrl = query ? `${url}?${encodeURI(query)}` : url;
     const response = await axios.default.request({
       url: requestUrl,
       method: convertHttpMethodToAxiosMethod(httpMethod),
diff --git a/examples/apis/sample-debug.ts b/examples/apis/sample-debug.ts
index 3fdbaa4b..b9579499 100644
--- a/examples/apis/sample-debug.ts
+++ b/examples/apis/sample-debug.ts
@@ -15,7 +15,7 @@ const apiClientImpl: ApiClient<RequestOption> = {
     options?: RequestOption,
   ): Promise<any> => {
     const query = generateQueryString(queryParameters);
-    const requestUrl = query ? url + "?" + encodeURI(query) : url;
+    const requestUrl = query ? `${url}?${encodeURI(query)}` : url;
     console.log({
       httpMethod,
       url,
diff --git a/examples/apis/sample-fetch.ts b/examples/apis/sample-fetch.ts
index 4080d9a2..d46a0325 100644
--- a/examples/apis/sample-fetch.ts
+++ b/examples/apis/sample-fetch.ts
@@ -17,7 +17,7 @@ const apiClientImpl: ApiClient<RequestOption> = {
     options?: RequestOption,
   ): Promise<any> => {
     const query = generateQueryString(queryParameters);
-    const requestUrl = query ? url + "?" + encodeURI(query) : url;
+    const requestUrl = query ? `${url}?${encodeURI(query)}` : url;
     const response = await fetch(requestUrl, {
       body: JSON.stringify(requestBody),
       headers,
diff --git a/examples/apis/sample-superagent.ts b/examples/apis/sample-superagent.ts
index 12d5a12f..64e77d8e 100644
--- a/examples/apis/sample-superagent.ts
+++ b/examples/apis/sample-superagent.ts
@@ -19,7 +19,7 @@ const apiClientImpl: ApiClient<RequestOption> = {
     options?: RequestOption,
   ): Promise<any> => {
     const query = generateQueryString(queryParameters);
-    const requestUrl = query ? url + "?" + encodeURI(query) : url;
+    const requestUrl = query ? `${url}?${encodeURI(query)}` : url;
 
     return new Promise((resolve, reject) => {
       const agent = Superagent;
diff --git a/examples/readme-sample/ast-code-template.ts b/examples/readme-sample/ast-code-template.ts
index 40ed7233..0f8ef13d 100644
--- a/examples/readme-sample/ast-code-template.ts
+++ b/examples/readme-sample/ast-code-template.ts
@@ -1,7 +1,7 @@
 import { TsGenerator } from "@himenon/openapi-typescript-code-generator/dist/api";
 import * as Types from "@himenon/openapi-typescript-code-generator/dist/types";
 
-interface Option {}
+type Option = {};
 
 const factory = TsGenerator.Factory.create();
 
diff --git a/examples/readme-sample/text-base-code-template.ts b/examples/readme-sample/text-base-code-template.ts
index 5680e1bf..c5304793 100644
--- a/examples/readme-sample/text-base-code-template.ts
+++ b/examples/readme-sample/text-base-code-template.ts
@@ -5,7 +5,7 @@ interface Option {
 }
 
 const generator: Types.CodeGenerator.GenerateFunction<Option> = (payload: Types.CodeGenerator.Params[], option): string[] => {
-  if (option && option.showLog) {
+  if (option?.showLog) {
     console.log("show log message");
   }
   return ["Hello world"];
diff --git a/examples/readme-sample/use-extract-schema-params.ts b/examples/readme-sample/use-extract-schema-params.ts
index a5f4aade..88675bd4 100644
--- a/examples/readme-sample/use-extract-schema-params.ts
+++ b/examples/readme-sample/use-extract-schema-params.ts
@@ -1,6 +1,6 @@
 import * as Types from "@himenon/openapi-typescript-code-generator/dist/types";
 
-interface Option {}
+type Option = {};
 
 const generator: Types.CodeGenerator.GenerateFunction<Option> = (payload: Types.CodeGenerator.Params[]): string[] => {
   return payload.map(params => {
diff --git a/jest.config.cjs b/jest.config.cjs
index 355555f6..0f9682d0 100644
--- a/jest.config.cjs
+++ b/jest.config.cjs
@@ -8,7 +8,7 @@ module.exports = {
   testEnvironment: "node",
   extensionsToTreatAsEsm: [".ts", ".tsx"],
   testMatch: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[tj]s?(x)"],
-  transformIgnorePatterns: [`/node_modules/(?!|dot-prop)`],
+  transformIgnorePatterns: ["/node_modules/(?!|dot-prop)"],
   transform: {
     "^.+\\.(t|j)sx?$": "@swc/jest",
   },
diff --git a/jest.snapshot.config.cjs b/jest.snapshot.config.cjs
index 4f75da89..8cdff133 100644
--- a/jest.snapshot.config.cjs
+++ b/jest.snapshot.config.cjs
@@ -8,7 +8,7 @@ module.exports = {
   testEnvironment: "node",
   extensionsToTreatAsEsm: [".ts", ".tsx"],
   testMatch: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[tj]s?(x)"],
-  transformIgnorePatterns: [`/node_modules/(?!|dot-prop)`],
+  transformIgnorePatterns: ["/node_modules/(?!|dot-prop)"],
   transform: {
     "^.+\\.(t|j)sx?$": [
       "@swc/jest",
diff --git a/scripts/tools/shell.ts b/scripts/tools/shell.ts
index 629be631..ffd91c82 100644
--- a/scripts/tools/shell.ts
+++ b/scripts/tools/shell.ts
@@ -1,4 +1,4 @@
-import { execa, ExecaChildProcess } from "execa";
+import { ExecaChildProcess, execa } from "execa";
 
 export const shell = (command: string, cwd: string = process.cwd()): ExecaChildProcess<string> => {
   return execa(command, {
diff --git a/src/code-templates/_shared/ApiClientArgument.ts b/src/code-templates/_shared/ApiClientArgument.ts
index e58401ce..4aca03a7 100644
--- a/src/code-templates/_shared/ApiClientArgument.ts
+++ b/src/code-templates/_shared/ApiClientArgument.ts
@@ -69,7 +69,7 @@ const createHeaders = (factory: TsGenerator.Factory.Type, { convertedParams }: C
     members.push(
       factory.PropertySignature.create({
         readOnly: false,
-        name: `Accept`,
+        name: "Accept",
         optional: false,
         type: factory.TypeReferenceNode.create({ name: "U" }),
       }),
diff --git a/src/code-templates/_shared/ApiClientInterface.ts b/src/code-templates/_shared/ApiClientInterface.ts
index 29632106..8c1bf860 100644
--- a/src/code-templates/_shared/ApiClientInterface.ts
+++ b/src/code-templates/_shared/ApiClientInterface.ts
@@ -2,8 +2,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../api";
 import type { CodeGenerator } from "../../types";
-import type { Option } from "./types";
 import type { MethodType } from "./MethodBody/types";
+import type { Option } from "./types";
 
 const httpMethodList: string[] = ["GET", "PUT", "POST", "DELETE", "OPTIONS", "HEAD", "PATCH", "TRACE"];
 
@@ -190,7 +190,7 @@ export const create = (
     }),
   });
 
-  const successResponseNames = list.map(item => item.convertedParams.responseSuccessNames).flat();
+  const successResponseNames = list.flatMap(item => item.convertedParams.responseSuccessNames);
 
   const errorResponseNamespace = factory.Namespace.create({
     export: true,
@@ -238,7 +238,7 @@ export const create = (
     name: "RequestArgs",
     members: [
       factory.PropertySignature.create({
-        name: `httpMethod`,
+        name: "httpMethod",
         readOnly: true,
         optional: false,
         type: factory.TypeReferenceNode.create({ name: "HttpMethod" }),
@@ -250,25 +250,25 @@ export const create = (
         type: factory.TypeReferenceNode.create({ name: "string" }),
       }),
       factory.PropertySignature.create({
-        name: `headers`,
+        name: "headers",
         readOnly: false,
         optional: false,
         type: objectLikeOrAnyType,
       }),
       factory.PropertySignature.create({
-        name: `requestBody`,
+        name: "requestBody",
         readOnly: false,
         optional: true,
         type: objectLikeOrAnyType,
       }),
       factory.PropertySignature.create({
-        name: `requestBodyEncoding`,
+        name: "requestBodyEncoding",
         readOnly: false,
         optional: true,
         type: factory.TypeReferenceNode.create({ name: "Record<string, Encoding>" }),
       }),
       factory.PropertySignature.create({
-        name: `queryParameters`,
+        name: "queryParameters",
         optional: true,
         readOnly: false,
         type: factory.UnionTypeNode.create({
diff --git a/src/code-templates/_shared/MethodBody/CallRequest.ts b/src/code-templates/_shared/MethodBody/CallRequest.ts
index f35192b7..c232cd75 100644
--- a/src/code-templates/_shared/MethodBody/CallRequest.ts
+++ b/src/code-templates/_shared/MethodBody/CallRequest.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
 import * as Utils from "../utils";
-import type { MethodType } from "./types";
 import { createEncodingMap } from "./createEncodingMap";
+import type { MethodType } from "./types";
 
 export interface Params {
   httpMethod: string;
diff --git a/src/code-templates/_shared/MethodBody/PathParameter.ts b/src/code-templates/_shared/MethodBody/PathParameter.ts
index 6b6cd0f8..b0b2c51e 100644
--- a/src/code-templates/_shared/MethodBody/PathParameter.ts
+++ b/src/code-templates/_shared/MethodBody/PathParameter.ts
@@ -2,8 +2,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
-import * as Utils from "../utils";
 import { escapeText2 as escapeText } from "../../../utils";
+import * as Utils from "../utils";
 import type { MethodType } from "./types";
 
 export const isPathParameter = (params: any): params is CodeGenerator.PickedParameter => {
diff --git a/src/code-templates/_shared/MethodBody/__tests__/PathParameter-test.ts b/src/code-templates/_shared/MethodBody/__tests__/PathParameter-test.ts
index 5fd09784..35afae81 100644
--- a/src/code-templates/_shared/MethodBody/__tests__/PathParameter-test.ts
+++ b/src/code-templates/_shared/MethodBody/__tests__/PathParameter-test.ts
@@ -45,21 +45,21 @@ describe("PathParameter Test", () => {
     return getText(expression);
   };
   test("generateUrlTemplateExpression", () => {
-    expect(generate("/{a}", [{ in: "path", name: "a", required: true }])).toEqual("`/${params.parameter.a}`;" + EOL);
-    expect(generate("/{a}/", [{ in: "path", name: "a", required: true }])).toEqual("`/${params.parameter.a}/`;" + EOL);
-    expect(generate("/a/{b}", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${params.parameter.b}`;" + EOL);
-    expect(generate("/a/{b}/", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${params.parameter.b}/`;" + EOL);
-    expect(generate("/a/{b}/c", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${params.parameter.b}/c`;" + EOL);
-    expect(generate("/a/{b}/c/", [{ in: "path", name: "b", required: true }])).toEqual("`/a/${params.parameter.b}/c/`;" + EOL);
-    expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${params.parameter.c}`;" + EOL);
-    expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${params.parameter.c}`;" + EOL);
-    expect(generate("/a/b/{c}/", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${params.parameter.c}/`;" + EOL);
-    expect(generate("/a/b/{c}.json", [{ in: "path", name: "c", required: true }])).toEqual("`/a/b/${params.parameter.c}.json`;" + EOL);
+    expect(generate("/{a}", [{ in: "path", name: "a", required: true }])).toEqual(`\`/\${params.parameter.a}\`;${EOL}`);
+    expect(generate("/{a}/", [{ in: "path", name: "a", required: true }])).toEqual(`\`/\${params.parameter.a}/\`;${EOL}`);
+    expect(generate("/a/{b}", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${params.parameter.b}\`;${EOL}`);
+    expect(generate("/a/{b}/", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${params.parameter.b}/\`;${EOL}`);
+    expect(generate("/a/{b}/c", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${params.parameter.b}/c\`;${EOL}`);
+    expect(generate("/a/{b}/c/", [{ in: "path", name: "b", required: true }])).toEqual(`\`/a/\${params.parameter.b}/c/\`;${EOL}`);
+    expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${params.parameter.c}\`;${EOL}`);
+    expect(generate("/a/b/{c}", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${params.parameter.c}\`;${EOL}`);
+    expect(generate("/a/b/{c}/", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${params.parameter.c}/\`;${EOL}`);
+    expect(generate("/a/b/{c}.json", [{ in: "path", name: "c", required: true }])).toEqual(`\`/a/b/\${params.parameter.c}.json\`;${EOL}`);
     expect(generate("/{a}.json/{a}.json/{a}.json", [{ in: "path", name: "a", required: true }])).toEqual(
-      "`/${params.parameter.a}.json/${params.parameter.a}.json/${params.parameter.a}.json`;" + EOL,
+      `\`/\${params.parameter.a}.json/\${params.parameter.a}.json/\${params.parameter.a}.json\`;${EOL}`,
     );
     expect(generate("/.json.{a}.json/{a}.json.{a}", [{ in: "path", name: "a", required: true }])).toEqual(
-      "`/.json.${params.parameter.a}.json/${params.parameter.a}.json.${params.parameter.a}`;" + EOL,
+      `\`/.json.\${params.parameter.a}.json/\${params.parameter.a}.json.\${params.parameter.a}\`;${EOL}`,
     );
 
     expect(
@@ -67,54 +67,54 @@ describe("PathParameter Test", () => {
         { in: "path", name: "a", required: true },
         { in: "path", name: "b", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/${params.parameter.b}`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/\${params.parameter.b}\`;${EOL}`);
     expect(
       generate("/{a}/{b}/", [
         { in: "path", name: "a", required: true },
         { in: "path", name: "b", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/${params.parameter.b}/`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/\${params.parameter.b}/\`;${EOL}`);
     expect(
       generate("/{a}/{b}/c", [
         { in: "path", name: "a", required: true },
         { in: "path", name: "b", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/${params.parameter.b}/c`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/\${params.parameter.b}/c\`;${EOL}`);
     expect(
       generate("/{a}/{b}/c/", [
         { in: "path", name: "a", required: true },
         { in: "path", name: "b", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/${params.parameter.b}/c/`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/\${params.parameter.b}/c/\`;${EOL}`);
     expect(
       generate("/{a}/b/{c}", [
         { in: "path", name: "a", required: true },
         { in: "path", name: "c", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/b/${params.parameter.c}`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/b/\${params.parameter.c}\`;${EOL}`);
     expect(
       generate("/{a}/b/{c}/", [
         { in: "path", name: "a", required: true },
         { in: "path", name: "c", required: true },
       ]),
-    ).toBe("`/${params.parameter.a}/b/${params.parameter.c}/`;" + EOL);
+    ).toBe(`\`/\${params.parameter.a}/b/\${params.parameter.c}/\`;${EOL}`);
     expect(
       generate("/a/{b}/{c}", [
         { in: "path", name: "b", required: true },
         { in: "path", name: "c", required: true },
       ]),
-    ).toBe("`/a/${params.parameter.b}/${params.parameter.c}`;" + EOL);
+    ).toBe(`\`/a/\${params.parameter.b}/\${params.parameter.c}\`;${EOL}`);
     expect(
       generate("/a/{b}/{c}/", [
         { in: "path", name: "b", required: true },
         { in: "path", name: "c", required: true },
       ]),
-    ).toBe("`/a/${params.parameter.b}/${params.parameter.c}/`;" + EOL);
+    ).toBe(`\`/a/\${params.parameter.b}/\${params.parameter.c}/\`;${EOL}`);
     expect(
       generate("/a/{b}...{c}/", [
         { in: "path", name: "b", required: true },
         { in: "path", name: "c", required: true },
       ]),
-    ).toBe("`/a/${params.parameter.b}...${params.parameter.c}/`;" + EOL);
+    ).toBe(`\`/a/\${params.parameter.b}...\${params.parameter.c}/\`;${EOL}`);
   });
 });
diff --git a/src/code-templates/_shared/MethodBody/index.ts b/src/code-templates/_shared/MethodBody/index.ts
index f0af0c51..8d648ba5 100644
--- a/src/code-templates/_shared/MethodBody/index.ts
+++ b/src/code-templates/_shared/MethodBody/index.ts
@@ -8,8 +8,8 @@ import * as CallRequest from "./CallRequest";
 import * as HeaderParameter from "./HeaderParameter";
 import * as PathParameter from "./PathParameter";
 import * as QueryParameter from "./QueryParameter";
-import type { MethodType } from "./types";
 import { createEncodingMap } from "./createEncodingMap";
+import type { MethodType } from "./types";
 
 export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.Params, methodType: MethodType): ts.Statement[] => {
   const statements: ts.Statement[] = [];
@@ -27,7 +27,7 @@ export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.
   if (convertedParams.has2OrMoreRequestContentTypes) {
     initialHeaderObject["Content-Type"] = {
       type: "variable",
-      value: `params.headers.Content-Type`,
+      value: "params.headers.Content-Type",
     };
   } else if (convertedParams.requestFirstContentType) {
     initialHeaderObject["Content-Type"] = {
@@ -36,12 +36,12 @@ export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.
     };
   }
   if (convertedParams.has2OrMoreSuccessResponseContentTypes) {
-    initialHeaderObject["Accept"] = {
+    initialHeaderObject.Accept = {
       type: "variable",
-      value: `params.headers.Accept`,
+      value: "params.headers.Accept",
     };
   } else if (convertedParams.successResponseFirstContentType) {
-    initialHeaderObject["Accept"] = {
+    initialHeaderObject.Accept = {
       type: "string",
       value: convertedParams.successResponseFirstContentType,
     };
diff --git a/src/code-templates/_shared/utils.ts b/src/code-templates/_shared/utils.ts
index 4c909a86..c2fcfdaa 100644
--- a/src/code-templates/_shared/utils.ts
+++ b/src/code-templates/_shared/utils.ts
@@ -53,43 +53,40 @@ const getTemplateSpan = (
           }),
         }),
       ];
-    } else {
-      return [
-        factory.TemplateSpan.create({
-          expression: currentItem.value,
-          literal: factory.TemplateTail.create({
-            text: "",
-          }),
-        }),
-        factory.TemplateSpan.create({
-          expression: nextItem.value,
-          literal: factory.TemplateMiddle.create({
-            text: "",
-          }),
-        }),
-      ];
     }
-  } else {
-    if (lastIndex === nextIndex) {
-      return [
-        factory.TemplateSpan.create({
-          expression: currentItem.value,
-          literal: factory.TemplateTail.create({
-            text: nextItem.value,
-          }),
+    return [
+      factory.TemplateSpan.create({
+        expression: currentItem.value,
+        literal: factory.TemplateTail.create({
+          text: "",
         }),
-      ];
-    } else {
-      return [
-        factory.TemplateSpan.create({
-          expression: currentItem.value,
-          literal: factory.TemplateMiddle.create({
-            text: nextItem.value,
-          }),
+      }),
+      factory.TemplateSpan.create({
+        expression: nextItem.value,
+        literal: factory.TemplateMiddle.create({
+          text: "",
         }),
-      ];
-    }
+      }),
+    ];
   }
+  if (lastIndex === nextIndex) {
+    return [
+      factory.TemplateSpan.create({
+        expression: currentItem.value,
+        literal: factory.TemplateTail.create({
+          text: nextItem.value,
+        }),
+      }),
+    ];
+  }
+  return [
+    factory.TemplateSpan.create({
+      expression: currentItem.value,
+      literal: factory.TemplateMiddle.create({
+        text: nextItem.value,
+      }),
+    }),
+  ];
 };
 
 /**
@@ -172,11 +169,10 @@ export const splitVariableText = (text: string): VariableElement[] => {
         });
       }
       return splitList;
-    } else {
-      const dotSplited = value.split(".");
-      const items = dotSplited.map<VariableAccessIdentifer>(childValue => ({ kind: "string", value: childValue }));
-      return splitList.concat(items);
     }
+    const dotSplited = value.split(".");
+    const items = dotSplited.map<VariableAccessIdentifer>(childValue => ({ kind: "string", value: childValue }));
+    return splitList.concat(items);
   }, []);
 };
 
@@ -185,7 +181,7 @@ export const generateVariableIdentifier = (
   name: string,
 ): ts.Identifier | ts.PropertyAccessExpression | ts.ElementAccessExpression => {
   if (name.startsWith("/")) {
-    throw new Error("can't start '/'. name=" + name);
+    throw new Error(`can't start '/'. name=${name}`);
   }
   const list = splitVariableText(name);
   // Object参照していない変数名の場合
diff --git a/src/code-templates/class-api-client/ApiClientClass/Method.ts b/src/code-templates/class-api-client/ApiClientClass/Method.ts
index 11325eb2..02214ef3 100644
--- a/src/code-templates/class-api-client/ApiClientClass/Method.ts
+++ b/src/code-templates/class-api-client/ApiClientClass/Method.ts
@@ -4,8 +4,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
-import type { Option } from "../../_shared/types";
 import * as MethodBody from "../../_shared/MethodBody";
+import type { Option } from "../../_shared/types";
 
 export { MethodBody };
 
diff --git a/src/code-templates/class-api-client/ApiClientClass/index.ts b/src/code-templates/class-api-client/ApiClientClass/index.ts
index ed4b6a89..fe78a6a3 100644
--- a/src/code-templates/class-api-client/ApiClientClass/index.ts
+++ b/src/code-templates/class-api-client/ApiClientClass/index.ts
@@ -2,8 +2,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
-import type { Option } from "../../_shared/types";
 import * as ApiClientInterface from "../../_shared/ApiClientInterface";
+import type { Option } from "../../_shared/types";
 import * as Class from "./Class";
 import * as Constructor from "./Constructor";
 import * as Method from "./Method";
diff --git a/src/code-templates/class-api-client/index.ts b/src/code-templates/class-api-client/index.ts
index 8c17cd68..033e62af 100644
--- a/src/code-templates/class-api-client/index.ts
+++ b/src/code-templates/class-api-client/index.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import { TsGenerator } from "../../api";
 import type { CodeGenerator } from "../../types";
 import * as ApiClientArgument from "../_shared/ApiClientArgument";
-import * as ApiClientClass from "./ApiClientClass";
 import type { Option } from "../_shared/types";
+import * as ApiClientClass from "./ApiClientClass";
 
 export { Option };
 
diff --git a/src/code-templates/currying-functional-api-client/FunctionalApiClient/CurryingArrowFunction.ts b/src/code-templates/currying-functional-api-client/FunctionalApiClient/CurryingArrowFunction.ts
index 7985eeaa..300e9fa4 100644
--- a/src/code-templates/currying-functional-api-client/FunctionalApiClient/CurryingArrowFunction.ts
+++ b/src/code-templates/currying-functional-api-client/FunctionalApiClient/CurryingArrowFunction.ts
@@ -2,8 +2,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
-import type { Option } from "../../_shared/types";
 import * as MethodBody from "../../_shared/MethodBody";
+import type { Option } from "../../_shared/types";
 
 export { MethodBody };
 
diff --git a/src/code-templates/currying-functional-api-client/index.ts b/src/code-templates/currying-functional-api-client/index.ts
index 0b70562a..50cd0dd3 100644
--- a/src/code-templates/currying-functional-api-client/index.ts
+++ b/src/code-templates/currying-functional-api-client/index.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import { TsGenerator } from "../../api";
 import type { CodeGenerator } from "../../types";
 import * as ApiClientArgument from "../_shared/ApiClientArgument";
-import * as FunctionalApiClient from "./FunctionalApiClient";
 import * as ApiClientInterface from "../_shared/ApiClientInterface";
+import * as FunctionalApiClient from "./FunctionalApiClient";
 
 import type { Option } from "../_shared/types";
 
diff --git a/src/code-templates/functional-api-client/FunctionalApiClient/ArrowFunction.ts b/src/code-templates/functional-api-client/FunctionalApiClient/ArrowFunction.ts
index cdc53a7d..bb8d5dd6 100644
--- a/src/code-templates/functional-api-client/FunctionalApiClient/ArrowFunction.ts
+++ b/src/code-templates/functional-api-client/FunctionalApiClient/ArrowFunction.ts
@@ -2,8 +2,8 @@ import ts from "typescript";
 
 import type { TsGenerator } from "../../../api";
 import type { CodeGenerator } from "../../../types";
-import type { Option } from "../../_shared/types";
 import * as MethodBody from "../../_shared/MethodBody";
+import type { Option } from "../../_shared/types";
 
 export { MethodBody };
 
diff --git a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
index ad7b3553..2dcfa9f5 100644
--- a/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
+++ b/src/code-templates/functional-api-client/FunctionalApiClient/ClientTypeDefinition.ts
@@ -6,14 +6,14 @@ export const create = (factory: TsGenerator.Factory.Type): ts.TypeAliasDeclarati
     factory.TypeAliasDeclaration.create({
       name: "ClientFunction<RequestOption>",
       type: factory.TypeReferenceNode.create({
-        name: `typeof createClient<RequestOption>`,
+        name: "typeof createClient<RequestOption>",
       }),
     }),
     factory.TypeAliasDeclaration.create({
       export: true,
       name: "Client<RequestOption>",
       type: factory.TypeReferenceNode.create({
-        name: `ReturnType<ClientFunction<RequestOption>>`,
+        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 7c65c9b7..b0647285 100644
--- a/src/code-templates/functional-api-client/index.ts
+++ b/src/code-templates/functional-api-client/index.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import { TsGenerator } from "../../api";
 import type { CodeGenerator } from "../../types";
 import * as ApiClientArgument from "../_shared/ApiClientArgument";
-import * as FunctionalApiClient from "./FunctionalApiClient";
 import * as ApiClientInterface from "../_shared/ApiClientInterface";
+import * as FunctionalApiClient from "./FunctionalApiClient";
 import * as ClientTypeDefinition from "./FunctionalApiClient/ClientTypeDefinition";
 
 import type { Option } from "../_shared/types";
diff --git a/src/index.ts b/src/index.ts
index 3a6b2bb4..26d83eb0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -74,11 +74,9 @@ export class CodeGenerator {
   public generateCode(generatorTemplates: Types.CodeGenerator.CustomGenerator<any>[], allowOperationIds?: string[]): string {
     const payload = this.parser.getCodeGeneratorParamsArray(allowOperationIds);
     const create = () => {
-      return generatorTemplates
-        .map(generatorTemplate => {
-          return Api.TsGenerator.Utils.convertIntermediateCodes(generatorTemplate?.generator(payload, generatorTemplate.option));
-        })
-        .flat();
+      return generatorTemplates.flatMap(generatorTemplate => {
+        return Api.TsGenerator.Utils.convertIntermediateCodes(generatorTemplate?.generator(payload, generatorTemplate.option));
+      });
     };
     return [Api.OpenApiTools.Comment.generateLeading(this.resolvedReferenceDocument), Api.TsGenerator.generate(create)].join(EOL + EOL + EOL);
   }
diff --git a/src/internal/FileSystem/index.ts b/src/internal/FileSystem/index.ts
index 7aa3e772..449a203b 100644
--- a/src/internal/FileSystem/index.ts
+++ b/src/internal/FileSystem/index.ts
@@ -28,7 +28,7 @@ export class FileSystem {
   }
 
   public static existSync(entryPoint: string): boolean {
-    const fragmentIndex = entryPoint.indexOf(this.FRAGMENT);
+    const fragmentIndex = entryPoint.indexOf(FileSystem.FRAGMENT);
     const hasFragment = fragmentIndex !== -1;
     if (hasFragment) {
       const filename = entryPoint.substring(0, fragmentIndex);
@@ -38,12 +38,12 @@ export class FileSystem {
   }
 
   public static loadJsonOrYaml(entryPoint: string): any {
-    const hasFragment = entryPoint.indexOf(this.FRAGMENT) !== -1;
+    const hasFragment = entryPoint.indexOf(FileSystem.FRAGMENT) !== -1;
     if (hasFragment) {
-      const [filename, fragment] = entryPoint.split(this.FRAGMENT);
-      const data = this.internalLoadJsonOrYaml(filename);
+      const [filename, fragment] = entryPoint.split(FileSystem.FRAGMENT);
+      const data = FileSystem.internalLoadJsonOrYaml(filename);
       return DotProp.getProperty(data, fragment.replace(/\//g, "."));
     }
-    return this.internalLoadJsonOrYaml(entryPoint);
+    return FileSystem.internalLoadJsonOrYaml(entryPoint);
   }
 }
diff --git a/src/internal/OpenApiTools/Comment.ts b/src/internal/OpenApiTools/Comment.ts
index 5645f6c7..fea48476 100644
--- a/src/internal/OpenApiTools/Comment.ts
+++ b/src/internal/OpenApiTools/Comment.ts
@@ -2,7 +2,7 @@ import { EOL } from "os";
 
 import type { OpenApi } from "../../types";
 
-import { Version, Name } from "../../meta";
+import { Name, Version } from "../../meta";
 
 export const generateLeading = (schema: OpenApi.Document): string => {
   const messages: string[] = [];
diff --git a/src/internal/OpenApiTools/Guard.ts b/src/internal/OpenApiTools/Guard.ts
index 6e635f03..634c6d6d 100644
--- a/src/internal/OpenApiTools/Guard.ts
+++ b/src/internal/OpenApiTools/Guard.ts
@@ -1,6 +1,6 @@
 import type { OpenApi } from "../../types";
-import * as Types from "./types";
 import { Def } from "./Walker";
+import * as Types from "./types";
 
 export const isReference = (data: any): data is OpenApi.Reference => {
   if (typeof data !== "object" || data === null) {
diff --git a/src/internal/OpenApiTools/Parser.ts b/src/internal/OpenApiTools/Parser.ts
index b51e22fd..b8851ec7 100644
--- a/src/internal/OpenApiTools/Parser.ts
+++ b/src/internal/OpenApiTools/Parser.ts
@@ -2,16 +2,16 @@ import ts from "typescript";
 
 import type { CodeGenerator, OpenApi } from "../../types";
 import * as TypeScriptCodeGenerator from "../TsGenerator";
+import * as ConvertContext from "./ConverterContext";
+import * as Extractor from "./Extractor";
+import * as TypeNodeContext from "./TypeNodeContext";
+import { Store } from "./Walker";
 import * as Headers from "./components/Headers";
 import * as Parameters from "./components/Parameters";
 import * as RequestBodies from "./components/RequestBodies";
 import * as Responses from "./components/Responses";
 import * as Schemas from "./components/Schemas";
-import * as ConvertContext from "./ConverterContext";
-import * as Extractor from "./Extractor";
 import * as Paths from "./paths";
-import * as TypeNodeContext from "./TypeNodeContext";
-import { Store } from "./Walker";
 
 export { ConvertContext };
 
diff --git a/src/internal/OpenApiTools/TypeNodeContext.ts b/src/internal/OpenApiTools/TypeNodeContext.ts
index 50f9c8df..4fde713d 100644
--- a/src/internal/OpenApiTools/TypeNodeContext.ts
+++ b/src/internal/OpenApiTools/TypeNodeContext.ts
@@ -7,10 +7,10 @@ import type { OpenApi } from "../../types";
 import { DevelopmentError } from "../Exception";
 import * as TypeScriptCodeGenerator from "../TsGenerator";
 import * as ConverterContext from "./ConverterContext";
-import * as ToTypeNode from "./toTypeNode";
-import type * as Walker from "./Walker";
 import * as Guard from "./Guard";
+import type * as Walker from "./Walker";
 import * as Reference from "./components/Reference";
+import * as ToTypeNode from "./toTypeNode";
 
 export interface ReferencePathSet {
   pathArray: string[];
@@ -52,15 +52,16 @@ const calculateReferencePath = (
       if (statement) {
         names.push(statement.name);
         return current;
-      } else if (statement2) {
+      }
+      if (statement2) {
         names.push(statement2.name);
         return current;
-      } else if (statement3) {
+      }
+      if (statement3) {
         names.push(statement3.name);
         return current;
-      } else {
-        unresolvedPaths.push(lastPath);
       }
+      unresolvedPaths.push(lastPath);
     } else {
       const statement = store.getStatement(current, "namespace");
       if (statement) {
@@ -73,7 +74,7 @@ const calculateReferencePath = (
     return current;
   }, base);
   if (names.length === 0) {
-    throw new DevelopmentError("Local Reference Error \n" + JSON.stringify({ pathArray, names, base }, null, 2));
+    throw new DevelopmentError(`Local Reference Error \n${JSON.stringify({ pathArray, names, base }, null, 2)}`);
   }
   const maybeResolvedNameFragments = names.concat(unresolvedPaths).map(converterContext.escapeDeclarationText);
   return {
diff --git a/src/internal/OpenApiTools/Walker/Store.ts b/src/internal/OpenApiTools/Walker/Store.ts
index 160f329e..b9596e53 100644
--- a/src/internal/OpenApiTools/Walker/Store.ts
+++ b/src/internal/OpenApiTools/Walker/Store.ts
@@ -137,7 +137,7 @@ class Store {
   }
   public getPathItem(localPath: string): OpenApi.PathItem {
     if (!localPath.startsWith("components/pathItem")) {
-      throw new Error("Only use start with 'component/pathItems': " + localPath);
+      throw new Error(`Only use start with 'component/pathItems': ${localPath}`);
     }
     const result = DotProp.getProperty(this.state.document, localPath.replace(/\//g, "."));
     if (!result) {
@@ -147,7 +147,7 @@ class Store {
   }
   public getParameter(localPath: string): OpenApi.Parameter {
     if (!localPath.startsWith("components/parameters")) {
-      throw new Error("Only use start with 'component/parameters': " + localPath);
+      throw new Error(`Only use start with 'component/parameters': ${localPath}`);
     }
     const result = DotProp.getProperty(this.state.document, localPath.replace(/\//g, "."));
     if (!result) {
diff --git a/src/internal/OpenApiTools/components/Headers.ts b/src/internal/OpenApiTools/components/Headers.ts
index 74aba1b8..6bbea4f4 100644
--- a/src/internal/OpenApiTools/components/Headers.ts
+++ b/src/internal/OpenApiTools/components/Headers.ts
@@ -4,8 +4,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Header from "./Header";
 import * as Reference from "./Reference";
 import * as Schema from "./Schema";
diff --git a/src/internal/OpenApiTools/components/Operation.ts b/src/internal/OpenApiTools/components/Operation.ts
index 9dbc03b1..903d10eb 100644
--- a/src/internal/OpenApiTools/components/Operation.ts
+++ b/src/internal/OpenApiTools/components/Operation.ts
@@ -8,8 +8,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as ExternalDocumentation from "./ExternalDocumentation";
 import * as Parameter from "./Parameter";
 import * as Reference from "./Reference";
@@ -46,7 +46,7 @@ export const generateNamespace = (
   const basePath = `${parentPath}/${name}`;
   const operationId = operation.operationId;
   if (!operationId) {
-    throw new Error("not setting operationId\n" + JSON.stringify(operation));
+    throw new Error(`not setting operationId\n${JSON.stringify(operation)}`);
   }
   store.addStatement(basePath, {
     kind: "namespace",
@@ -136,7 +136,7 @@ export const generateStatements = (
   let statements: ts.Statement[] = [];
   const operationId = operation.operationId;
   if (!operationId) {
-    throw new Error("not setting operationId\n" + JSON.stringify(operation));
+    throw new Error(`not setting operationId\n${JSON.stringify(operation)}`);
   }
   store.updateOperationState(httpMethod, requestUri, operationId, {});
   const parameters = [...(pathItemParameters || []), ...(operation.parameters || [])];
@@ -157,7 +157,7 @@ export const generateStatements = (
             export: true,
             name: converterContext.generateRequestBodyName(operationId),
             type: factory.TypeReferenceNode.create({
-              name: context.resolveReferencePath(currentPoint, `${reference.path}`).name + "." + Name.ComponentChild.Content, // TODO Contextから作成？
+              name: `${context.resolveReferencePath(currentPoint, `${reference.path}`).name}.${Name.ComponentChild.Content}`, // TODO Contextから作成？
             }),
           }),
         );
diff --git a/src/internal/OpenApiTools/components/Parameter.ts b/src/internal/OpenApiTools/components/Parameter.ts
index 500db334..1287c764 100644
--- a/src/internal/OpenApiTools/components/Parameter.ts
+++ b/src/internal/OpenApiTools/components/Parameter.ts
@@ -4,8 +4,8 @@ import type { OpenApi } from "../../../types";
 import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Reference from "./Reference";
 
 export const generateTypeNode = (
diff --git a/src/internal/OpenApiTools/components/Parameters.ts b/src/internal/OpenApiTools/components/Parameters.ts
index 90444bc2..31011f22 100644
--- a/src/internal/OpenApiTools/components/Parameters.ts
+++ b/src/internal/OpenApiTools/components/Parameters.ts
@@ -4,8 +4,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Paramter from "./Parameter";
 import * as Reference from "./Reference";
 import * as Schema from "./Schema";
@@ -30,33 +30,32 @@ export const generateNamespace = (
       const reference = Reference.generate<OpenApi.Parameter>(entryPoint, currentPoint, parameter);
       if (reference.type === "local") {
         throw new UnSupportError("What is components.parameters local reference?");
-      } else {
-        if (!reference.data.schema) {
-          return;
-        }
-        Schema.addSchema(
-          entryPoint,
-          currentPoint,
-          store,
-          factory,
-          reference.path,
-          reference.name,
-          reference.data.schema,
-          context,
-          converterContext,
-        );
-        store.addStatement(`${basePath}/${name}`, {
-          kind: "typeAlias",
+      }
+      if (!reference.data.schema) {
+        return;
+      }
+      Schema.addSchema(
+        entryPoint,
+        currentPoint,
+        store,
+        factory,
+        reference.path,
+        reference.name,
+        reference.data.schema,
+        context,
+        converterContext,
+      );
+      store.addStatement(`${basePath}/${name}`, {
+        kind: "typeAlias",
+        name: converterContext.escapeDeclarationText(name),
+        value: factory.TypeAliasDeclaration.create({
+          export: true,
           name: converterContext.escapeDeclarationText(name),
-          value: factory.TypeAliasDeclaration.create({
-            export: true,
-            name: converterContext.escapeDeclarationText(name),
-            type: factory.TypeReferenceNode.create({
-              name: context.resolveReferencePath(currentPoint, reference.path).name,
-            }),
+          type: factory.TypeReferenceNode.create({
+            name: context.resolveReferencePath(currentPoint, reference.path).name,
           }),
-        });
-      }
+        }),
+      });
     } else {
       const path = `${basePath}/${name}`;
       store.addStatement(path, {
diff --git a/src/internal/OpenApiTools/components/PathItem.ts b/src/internal/OpenApiTools/components/PathItem.ts
index 674227b2..dde8990f 100644
--- a/src/internal/OpenApiTools/components/PathItem.ts
+++ b/src/internal/OpenApiTools/components/PathItem.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import type { OpenApi } from "../../../types";
 import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Operation from "./Operation";
 import * as Parameters from "./Parameters";
 import * as Servers from "./Servers";
@@ -22,7 +22,7 @@ export const generateNamespace = (
   options?: { topComment?: string },
 ): void => {
   const basePath = `${parentPath}/${name}`;
-  const topComment = options && options.topComment && options.topComment;
+  const topComment = options?.topComment;
   store.addStatement(basePath, {
     kind: "namespace",
     name,
diff --git a/src/internal/OpenApiTools/components/PathItems.ts b/src/internal/OpenApiTools/components/PathItems.ts
index 76785672..71964c92 100644
--- a/src/internal/OpenApiTools/components/PathItems.ts
+++ b/src/internal/OpenApiTools/components/PathItems.ts
@@ -4,8 +4,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as PathItem from "./PathItem";
 import * as Reference from "./Reference";
 
@@ -31,7 +31,8 @@ export const generateNamespace = (
       const reference = Reference.generate<OpenApi.PathItem>(entryPoint, currentPoint, pathItem);
       if (reference.type === "local") {
         throw new UnSupportError("can't use components.pathItems local reference");
-      } else if (reference.componentName) {
+      }
+      if (reference.componentName) {
         if (key !== reference.name) {
           throw new UnSupportError(`can't use difference pathItem key name. "${key}" !== "${reference.name}"`);
         }
diff --git a/src/internal/OpenApiTools/components/Reference.ts b/src/internal/OpenApiTools/components/Reference.ts
index a446a788..1991fb7c 100644
--- a/src/internal/OpenApiTools/components/Reference.ts
+++ b/src/internal/OpenApiTools/components/Reference.ts
@@ -87,7 +87,7 @@ export const localReferenceComponents = {
 export const getLocalReferencePattern = (reference: OpenApi.Reference) => {
   let localReferencePattern: LocalReferencePattern | undefined;
   localReferencePatterns.forEach(referencePattern => {
-    if (new RegExp("^" + referencePattern).test(reference.$ref)) {
+    if (new RegExp(`^${referencePattern}`).test(reference.$ref)) {
       localReferencePattern = referencePattern;
     }
   });
diff --git a/src/internal/OpenApiTools/components/RequestBodies.ts b/src/internal/OpenApiTools/components/RequestBodies.ts
index 600487a2..9d0c1510 100644
--- a/src/internal/OpenApiTools/components/RequestBodies.ts
+++ b/src/internal/OpenApiTools/components/RequestBodies.ts
@@ -5,8 +5,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Reference from "./Reference";
 import * as RequestBody from "./RequestBody";
 
@@ -30,7 +30,8 @@ export const generateNamespace = (
       const reference = Reference.generate<OpenApi.RequestBody>(entryPoint, currentPoint, requestBody);
       if (reference.type === "local") {
         throw new Error("not support");
-      } else if (reference.type === "remote") {
+      }
+      if (reference.type === "remote") {
         RequestBody.generateNamespace(
           entryPoint,
           reference.referencePoint,
diff --git a/src/internal/OpenApiTools/components/RequestBody.ts b/src/internal/OpenApiTools/components/RequestBody.ts
index d942dd66..63a7576f 100644
--- a/src/internal/OpenApiTools/components/RequestBody.ts
+++ b/src/internal/OpenApiTools/components/RequestBody.ts
@@ -3,8 +3,8 @@ import ts from "typescript";
 import type { OpenApi } from "../../../types";
 import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as MediaType from "./MediaType";
 
 export const generateInterface = (
diff --git a/src/internal/OpenApiTools/components/Response.ts b/src/internal/OpenApiTools/components/Response.ts
index 7a2c834e..ce78dab6 100644
--- a/src/internal/OpenApiTools/components/Response.ts
+++ b/src/internal/OpenApiTools/components/Response.ts
@@ -4,8 +4,8 @@ import type { OpenApi } from "../../../types";
 import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Header from "./Header";
 import * as MediaType from "./MediaType";
 
@@ -110,7 +110,7 @@ export const generateReferenceNamespace = (
       export: true,
       name: Name.ComponentChild.Content,
       type: factory.TypeReferenceNode.create({
-        name: referenceNamespaceName + "." + Name.ComponentChild.Content, // TODO Contextから作成？
+        name: `${referenceNamespaceName}.${Name.ComponentChild.Content}`, // TODO Contextから作成？
       }),
     }),
   });
diff --git a/src/internal/OpenApiTools/components/Responses.ts b/src/internal/OpenApiTools/components/Responses.ts
index b27a179f..878b8b34 100644
--- a/src/internal/OpenApiTools/components/Responses.ts
+++ b/src/internal/OpenApiTools/components/Responses.ts
@@ -8,8 +8,8 @@ import { Factory } from "../../TsGenerator";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as MediaType from "./MediaType";
 import * as Reference from "./Reference";
 import * as Response from "./Response";
diff --git a/src/internal/OpenApiTools/components/Schema.ts b/src/internal/OpenApiTools/components/Schema.ts
index da6803c6..e9005b59 100644
--- a/src/internal/OpenApiTools/components/Schema.ts
+++ b/src/internal/OpenApiTools/components/Schema.ts
@@ -5,9 +5,9 @@ import { FeatureDevelopmentError } from "../../Exception";
 import { Factory } from "../../TsGenerator";
 import * as ConvertContext from "../ConverterContext";
 import * as Guard from "../Guard";
+import type * as Walker from "../Walker";
 import * as ToTypeNode from "../toTypeNode";
 import type { AnySchema, ArraySchema, ObjectSchema, PrimitiveSchema } from "../types";
-import type * as Walker from "../Walker";
 import * as ExternalDocumentation from "./ExternalDocumentation";
 
 const nullable = (factory: Factory.Type, typeNode: ts.TypeNode, nullable: boolean): ts.TypeNode => {
diff --git a/src/internal/OpenApiTools/components/Schemas.ts b/src/internal/OpenApiTools/components/Schemas.ts
index 5dfa40c7..c34e6e3d 100644
--- a/src/internal/OpenApiTools/components/Schemas.ts
+++ b/src/internal/OpenApiTools/components/Schemas.ts
@@ -6,8 +6,8 @@ import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
 import * as InferredType from "../InferredType";
 import * as Name from "../Name";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as ToTypeNode from "../toTypeNode";
 import * as Reference from "./Reference";
 import * as Schema from "./Schema";
 
@@ -169,6 +169,6 @@ export const generateNamespace = (
         { override: true },
       );
     }
-    throw new UnSupportError("schema.type = Array[] not supported. " + JSON.stringify(schema));
+    throw new UnSupportError(`schema.type = Array[] not supported. ${JSON.stringify(schema)}`);
   });
 };
diff --git a/src/internal/OpenApiTools/paths/index.ts b/src/internal/OpenApiTools/paths/index.ts
index 30c7d32d..39d3bf1a 100644
--- a/src/internal/OpenApiTools/paths/index.ts
+++ b/src/internal/OpenApiTools/paths/index.ts
@@ -2,12 +2,12 @@ import ts from "typescript";
 
 import type { OpenApi } from "../../../types";
 import { Factory } from "../../TsGenerator";
-import * as PathItem from "../components/PathItem";
-import * as Reference from "../components/Reference";
 import * as ConverterContext from "../ConverterContext";
 import * as Guard from "../Guard";
-import * as ToTypeNode from "../toTypeNode";
 import type * as Walker from "../Walker";
+import * as PathItem from "../components/PathItem";
+import * as Reference from "../components/Reference";
+import * as ToTypeNode from "../toTypeNode";
 
 export const generateStatements = (
   entryPoint: string,
@@ -19,7 +19,7 @@ export const generateStatements = (
   converterContext: ConverterContext.Types,
 ): void => {
   const statements: ts.Statement[][] = [];
-  Object.entries(paths).forEach(([requestUri, pathItem]) => {
+  for (const [requestUri, pathItem] of Object.entries(paths)) {
     if (!requestUri.startsWith("/")) {
       throw new Error(`Not start slash: ${requestUri}`);
     }
@@ -55,7 +55,7 @@ export const generateStatements = (
     } else {
       statements.push(PathItem.generateStatements(entryPoint, currentPoint, store, factory, requestUri, pathItem, context, converterContext));
     }
-  });
+  }
 
   store.addAdditionalStatement(statements.flat());
 };
diff --git a/src/internal/OpenApiTools/toTypeNode.ts b/src/internal/OpenApiTools/toTypeNode.ts
index d826b996..af2565e8 100644
--- a/src/internal/OpenApiTools/toTypeNode.ts
+++ b/src/internal/OpenApiTools/toTypeNode.ts
@@ -4,10 +4,10 @@ import type { OpenApi } from "../../types";
 import { UnSupportError } from "../Exception";
 import * as Logger from "../Logger";
 import { Factory } from "../TsGenerator";
-import * as Reference from "./components/Reference";
 import * as ConverterContext from "./ConverterContext";
 import * as Guard from "./Guard";
 import * as InferredType from "./InferredType";
+import * as Reference from "./components/Reference";
 import { ObjectSchemaWithAdditionalProperties } from "./types";
 
 export interface ResolveReferencePath {
@@ -112,10 +112,9 @@ export const convert: Convert = (
       const { maybeResolvedName, depth, pathArray } = context.resolveReferencePath(currentPoint, reference.path);
       if (depth === 2) {
         return factory.TypeReferenceNode.create({ name: converterContext.escapeReferenceDeclarationText(maybeResolvedName) });
-      } else {
-        const resolveSchema = context.findSchemaByPathArray(pathArray);
-        return convert(entryPoint, currentPoint, factory, resolveSchema, context, converterContext, { parent: schema });
       }
+      const resolveSchema = context.findSchemaByPathArray(pathArray);
+      return convert(entryPoint, currentPoint, factory, resolveSchema, context, converterContext, { parent: schema });
     }
     // サポートしているディレクトリに対して存在する場合
     if (reference.componentName) {
@@ -170,7 +169,7 @@ export const convert: Convert = (
       });
       return nullable(factory, typeNode, schema.nullable);
     }
-    if (option && option.parent) {
+    if (option?.parent) {
       const message = [
         "Schema Type is not found and is converted to the type any. The parent Schema is as follows.",
         "",
diff --git a/src/internal/ResolveReference/index.ts b/src/internal/ResolveReference/index.ts
index f44a165c..cc70810c 100644
--- a/src/internal/ResolveReference/index.ts
+++ b/src/internal/ResolveReference/index.ts
@@ -2,8 +2,8 @@ import * as DotProp from "dot-prop";
 
 import type { OpenApi } from "../../types";
 import { DevelopmentError } from "../Exception";
-import * as Reference from "../OpenApiTools/components/Reference";
 import * as Guard from "../OpenApiTools/Guard";
+import * as Reference from "../OpenApiTools/components/Reference";
 
 export { OpenApi };
 
@@ -87,13 +87,13 @@ const resolveLocalReference = (entryPoint: string, currentPoint: string, obj: an
         console.warn(`Feature support: ${obj.$ref}`);
         return {};
       }
-      throw new DevelopmentError("まずはremote referenceを解決してください\n" + JSON.stringify(obj, null, 2));
+      throw new DevelopmentError(`まずはremote referenceを解決してください\n${JSON.stringify(obj, null, 2)}`);
     }
     if (isLocalReference(obj)) {
       const ref = Reference.generateLocalReference(obj);
       if (!ref) {
         throw new DevelopmentError(
-          `This is an implementation error. Please report any reproducible information below.\nhttps://github.com/Himenon/openapi-typescript-code-generator/issues/new/choose\n`,
+          "This is an implementation error. Please report any reproducible information below.\nhttps://github.com/Himenon/openapi-typescript-code-generator/issues/new/choose\n",
         );
       }
       // "." in the key
diff --git a/src/internal/TsGenerator/factory/index.ts b/src/internal/TsGenerator/factory/index.ts
index c05d9019..3aa49f08 100644
--- a/src/internal/TsGenerator/factory/index.ts
+++ b/src/internal/TsGenerator/factory/index.ts
@@ -10,8 +10,8 @@ import * as ElementAccessExpression from "./ElementAccessExpression";
 import * as ExpressionStatement from "./ExpressionStatement";
 import * as FunctionTypeNode from "./FunctionTypeNode";
 import * as Identifier from "./Identifier";
-import * as IndexedAccessTypeNode from "./IndexedAccessTypeNode";
 import * as IndexSignatureDeclaration from "./IndexSignatureDeclaration";
+import * as IndexedAccessTypeNode from "./IndexedAccessTypeNode";
 import * as InterfaceDeclaration from "./InterfaceDeclaration";
 import * as IntersectionTypeNode from "./IntersectionTypeNode";
 import * as LiteralTypeNode from "./LiteralTypeNode";
@@ -26,6 +26,7 @@ import * as PropertyDeclaration from "./PropertyDeclaration";
 import * as PropertySignature from "./PropertySignature";
 import * as RegularExpressionLiteral from "./RegularExpressionLiteral";
 import * as ReturnStatement from "./ReturnStatement";
+import * as ShorthandPropertyAssignment from "./ShorthandPropertyAssignment";
 import * as StringLiteral from "./StringLiteral";
 import * as TemplateExpression from "./TemplateExpression";
 import * as TemplateHead from "./TemplateHead";
@@ -42,7 +43,6 @@ import * as UnionTypeNode from "./UnionTypeNode";
 import * as VariableDeclaration from "./VariableDeclaration";
 import * as VariableDeclarationList from "./VariableDeclarationList";
 import * as VariableStatement from "./VariableStatement";
-import * as ShorthandPropertyAssignment from "./ShorthandPropertyAssignment";
 export interface Type {
   ArrowFunction: ArrowFunction.Factory;
   Block: Block.Factory;
diff --git a/src/internal/TsGenerator/factory/utils.ts b/src/internal/TsGenerator/factory/utils.ts
index 41275e03..414f6ff6 100644
--- a/src/internal/TsGenerator/factory/utils.ts
+++ b/src/internal/TsGenerator/factory/utils.ts
@@ -28,11 +28,11 @@ export const generateComment = (comment: string, deprecated?: boolean): Comment
   if (comments.length === 1) {
     return {
       hasTrailingNewLine: true,
-      value: "* " + comments.join("") + " ",
+      value: `* ${comments.join("")} `,
     };
   }
   return {
     hasTrailingNewLine: true,
-    value: "*" + EOL + comments.map(comment => ` * ${comment}`).join(EOL) + EOL + " ",
+    value: `*${EOL}${comments.map(comment => ` * ${comment}`).join(EOL)}${EOL} `,
   };
 };
diff --git a/src/internal/Validator/index.ts b/src/internal/Validator/index.ts
index 073ca9e9..401a4ca7 100644
--- a/src/internal/Validator/index.ts
+++ b/src/internal/Validator/index.ts
@@ -8,7 +8,7 @@ import type { OpenApi, Validator } from "../../types";
 import openapiSchema from "./openapi.json" assert { type: "json" };
 
 const showLogs = (logs: any[], logger?: Validator.Logger) => {
-  if (logger && logger.displayLogLines && logger.displayLogLines > 0) {
+  if (logger?.displayLogLines && logger.displayLogLines > 0) {
     const latestLogs = logs.slice(0, logger.displayLogLines);
     const moreLogNum = logs.length - latestLogs.length;
     console.error("Correct the validation error before generating the code.");
diff --git a/src/typedef/OpenApi.ts b/src/typedef/OpenApi.ts
index 46a2fa6b..17bdff8d 100644
--- a/src/typedef/OpenApi.ts
+++ b/src/typedef/OpenApi.ts
@@ -1,4 +1,4 @@
-import type { JSONSchema7, JSONSchema7TypeName, JSONSchema7Type as JSONSchemaType } from "json-schema";
+import type { JSONSchema7, JSONSchema7Type as JSONSchemaType, JSONSchema7TypeName } from "json-schema";
 
 export type JSONSchemaTypeName = JSONSchema7TypeName;