diff --git a/.eslintingore b/.eslintingore
deleted file mode 100644
index b6072742..00000000
--- a/.eslintingore
+++ /dev/null
@@ -1,7 +0,0 @@
-lib
-debug
-test/code/
-lib/
-test/kubernetes
-test/argo-rollout
-CHANGELOG.md
diff --git a/.eslintrc.js b/.eslintrc.js
index 56dcbb4a..8cb9d76a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,19 +1,53 @@
+/**
+ * @type {import("eslint").Linter.Config}
+ */
 module.exports = {
   env: {
     browser: true,
-    es2021: true,
+    es2022: true,
+    node: true,
   },
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:import/typescript"],
+  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:import/typescript", "prettier"],
   parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaVersion: 12,
-    project: "tsconfig.json",
+    project: ["tsconfig.json"],
     sourceType: "module",
   },
-  plugins: ["@typescript-eslint"],
+  plugins: ["@typescript-eslint", "simple-import-sort", "unused-imports"],
   rules: {
+    eqeqeq: "error",
     "no-unused-vars": "off",
-    "@typescript-eslint/ban-types": "warn",
-    "@typescript-eslint/no-namespace": "off",
+    "unused-imports/no-unused-imports": "error",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      {
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_",
+        caughtErrorsIgnorePattern: "^_",
+      },
+    ],
+    "@typescript-eslint/ban-types": [
+      "error",
+      {
+        types: {
+          // un-ban a type that's banned by default
+          "{}": false,
+        },
+        extendDefaults: true,
+      },
+    ],
+    "@typescript-eslint/no-explicit-any": "off",
   },
+  overrides: [
+    {
+      files: ["example/**"],
+      rules: {
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-empty-interface": "off",
+        "@typescript-eslint/no-namespace": "off",
+      },
+    },
+  ],
 };
diff --git a/.gitignore b/.gitignore
index 7780cbf2..665ba3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ package-lock.json
 private_npm_cache
 test/code
 debug
+test/kubernetes
+test/argo-rollout
+CHANGELOG.md
diff --git a/example/readme-sample/use-extract-schema-params.ts b/example/readme-sample/use-extract-schema-params.ts
index 850b5483..7886d872 100644
--- a/example/readme-sample/use-extract-schema-params.ts
+++ b/example/readme-sample/use-extract-schema-params.ts
@@ -2,7 +2,7 @@ import * as Types from "@himenon/openapi-typescript-code-generator/types";
 
 interface Option {}
 
-const generator: Types.CodeGenerator.GenerateFunction<Option> = (payload: Types.CodeGenerator.Params[], option): string[] => {
+const generator: Types.CodeGenerator.GenerateFunction<Option> = (payload: Types.CodeGenerator.Params[]): string[] => {
   return payload.map(params => {
     return `function ${params.operationId}() { console.log("${params.comment}") }`;
   });
diff --git a/package.json b/package.json
index 93a53860..8e9178c6 100644
--- a/package.json
+++ b/package.json
@@ -87,9 +87,11 @@
     "conventional-changelog-angular-all": "1.7.0",
     "cpy": "8.1.2",
     "dependency-cruiser": "12.3.0",
-    "eslint": "8.31.0",
+    "eslint": "8.34.0",
     "eslint-config-prettier": "8.6.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-simple-import-sort": "^8.0.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
     "execa": "5.0.0",
     "generate-changelog": "1.8.0",
     "import-sort-style-module": "6.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9923b816..bcf111df 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,9 +25,11 @@ specifiers:
   cpy: 8.1.2
   dependency-cruiser: 12.3.0
   dot-prop: 6.0.1
-  eslint: 8.31.0
+  eslint: 8.34.0
   eslint-config-prettier: 8.6.0
-  eslint-plugin-import: 2.26.0
+  eslint-plugin-import: 2.27.5
+  eslint-plugin-simple-import-sort: ^8.0.0
+  eslint-plugin-unused-imports: ^2.0.0
   execa: 5.0.0
   generate-changelog: 1.8.0
   import-sort-style-module: 6.0.0
@@ -66,15 +68,17 @@ devDependencies:
   "@types/js-yaml": 4.0.5
   "@types/node": 18.11.18
   "@types/rimraf": 3.0.2
-  "@typescript-eslint/eslint-plugin": 5.48.0_k73wpmdolxikpyqun3p36akaaq
-  "@typescript-eslint/parser": 5.48.0_iukboom6ndih5an6iafl45j2fe
+  "@typescript-eslint/eslint-plugin": 5.48.0_cviumkbgit4ykamswmghiujp3i
+  "@typescript-eslint/parser": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
   chokidar: 3.5.3
   conventional-changelog-angular-all: 1.7.0
   cpy: 8.1.2
   dependency-cruiser: 12.3.0
-  eslint: 8.31.0
-  eslint-config-prettier: 8.6.0_eslint@8.31.0
-  eslint-plugin-import: 2.26.0_m2kn7xiag5lymyarkgri27ztxm
+  eslint: 8.34.0
+  eslint-config-prettier: 8.6.0_eslint@8.34.0
+  eslint-plugin-import: 2.27.5_srp5jszoagkj3pnpsesjjepemq
+  eslint-plugin-simple-import-sort: 8.0.0_eslint@8.34.0
+  eslint-plugin-unused-imports: 2.0.0_3p5c3yu7rnlwfc7nnagwrjhciu
   execa: 5.0.0
   generate-changelog: 1.8.0
   import-sort-style-module: 6.0.0
@@ -2136,7 +2140,7 @@ packages:
       "@types/yargs-parser": 21.0.0
     dev: true
 
-  /@typescript-eslint/eslint-plugin/5.48.0_k73wpmdolxikpyqun3p36akaaq:
+  /@typescript-eslint/eslint-plugin/5.48.0_cviumkbgit4ykamswmghiujp3i:
     resolution: { integrity: sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ== }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     peerDependencies:
@@ -2147,12 +2151,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.48.0_iukboom6ndih5an6iafl45j2fe
+      "@typescript-eslint/parser": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
       "@typescript-eslint/scope-manager": 5.48.0
-      "@typescript-eslint/type-utils": 5.48.0_iukboom6ndih5an6iafl45j2fe
-      "@typescript-eslint/utils": 5.48.0_iukboom6ndih5an6iafl45j2fe
+      "@typescript-eslint/type-utils": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
+      "@typescript-eslint/utils": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
       debug: 4.3.4
-      eslint: 8.31.0
+      eslint: 8.34.0
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
@@ -2163,7 +2167,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.48.0_iukboom6ndih5an6iafl45j2fe:
+  /@typescript-eslint/parser/5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a:
     resolution: { integrity: sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg== }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     peerDependencies:
@@ -2177,7 +2181,7 @@ packages:
       "@typescript-eslint/types": 5.48.0
       "@typescript-eslint/typescript-estree": 5.48.0_typescript@4.9.4
       debug: 4.3.4
-      eslint: 8.31.0
+      eslint: 8.34.0
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
@@ -2191,7 +2195,7 @@ packages:
       "@typescript-eslint/visitor-keys": 5.48.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.48.0_iukboom6ndih5an6iafl45j2fe:
+  /@typescript-eslint/type-utils/5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a:
     resolution: { integrity: sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g== }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     peerDependencies:
@@ -2202,9 +2206,9 @@ packages:
         optional: true
     dependencies:
       "@typescript-eslint/typescript-estree": 5.48.0_typescript@4.9.4
-      "@typescript-eslint/utils": 5.48.0_iukboom6ndih5an6iafl45j2fe
+      "@typescript-eslint/utils": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
       debug: 4.3.4
-      eslint: 8.31.0
+      eslint: 8.34.0
       tsutils: 3.21.0_typescript@4.9.4
       typescript: 4.9.4
     transitivePeerDependencies:
@@ -2237,7 +2241,7 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.48.0_iukboom6ndih5an6iafl45j2fe:
+  /@typescript-eslint/utils/5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a:
     resolution: { integrity: sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ== }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     peerDependencies:
@@ -2248,9 +2252,9 @@ packages:
       "@typescript-eslint/scope-manager": 5.48.0
       "@typescript-eslint/types": 5.48.0
       "@typescript-eslint/typescript-estree": 5.48.0_typescript@4.9.4
-      eslint: 8.31.0
+      eslint: 8.34.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.31.0
+      eslint-utils: 3.0.0_eslint@8.34.0
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
@@ -2473,14 +2477,14 @@ packages:
     resolution: { integrity: sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= }
     dev: true
 
-  /array-includes/3.1.4:
-    resolution: { integrity: sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== }
+  /array-includes/3.1.6:
+    resolution: { integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== }
     engines: { node: ">= 0.4" }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.2
-      get-intrinsic: 1.1.1
+      define-properties: 1.1.4
+      es-abstract: 1.20.5
+      get-intrinsic: 1.1.3
       is-string: 1.0.7
     dev: true
 
@@ -2506,13 +2510,24 @@ packages:
     engines: { node: ">=0.10.0" }
     dev: true
 
-  /array.prototype.flat/1.2.5:
-    resolution: { integrity: sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== }
+  /array.prototype.flat/1.3.1:
+    resolution: { integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== }
     engines: { node: ">= 0.4" }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.5
+      es-shim-unscopables: 1.0.0
+    dev: true
+
+  /array.prototype.flatmap/1.3.1:
+    resolution: { integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== }
+    engines: { node: ">= 0.4" }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.5
+      es-shim-unscopables: 1.0.0
     dev: true
 
   /array.prototype.reduce/1.0.5:
@@ -3754,6 +3769,12 @@ packages:
     resolution: { integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== }
     dev: true
 
+  /es-shim-unscopables/1.0.0:
+    resolution: { integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== }
+    dependencies:
+      has: 1.0.3
+    dev: true
+
   /es-to-primitive/1.2.1:
     resolution: { integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== }
     engines: { node: ">= 0.4" }
@@ -3783,35 +3804,39 @@ packages:
     engines: { node: ">=10" }
     dev: true
 
-  /eslint-config-prettier/8.6.0_eslint@8.31.0:
+  /eslint-config-prettier/8.6.0_eslint@8.34.0:
     resolution: { integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA== }
     hasBin: true
     peerDependencies:
       eslint: ">=7.0.0"
     dependencies:
-      eslint: 8.31.0
+      eslint: 8.34.0
     dev: true
 
-  /eslint-import-resolver-node/0.3.6:
-    resolution: { integrity: sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== }
+  /eslint-import-resolver-node/0.3.7:
+    resolution: { integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== }
     dependencies:
       debug: 3.2.7
-      resolve: 1.22.0
+      is-core-module: 2.11.0
+      resolve: 1.22.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-module-utils/2.7.3_j3yic7rgljchaotpxpgqdbhhna:
-    resolution: { integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== }
+  /eslint-module-utils/2.7.4_7tt65c33h36wrjxv6iulwpakhy:
+    resolution: { integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== }
     engines: { node: ">=4" }
     peerDependencies:
       "@typescript-eslint/parser": "*"
+      eslint: "*"
       eslint-import-resolver-node: "*"
       eslint-import-resolver-typescript: "*"
       eslint-import-resolver-webpack: "*"
     peerDependenciesMeta:
       "@typescript-eslint/parser":
         optional: true
+      eslint:
+        optional: true
       eslint-import-resolver-node:
         optional: true
       eslint-import-resolver-typescript:
@@ -3819,16 +3844,16 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.48.0_iukboom6ndih5an6iafl45j2fe
+      "@typescript-eslint/parser": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
       debug: 3.2.7
-      eslint-import-resolver-node: 0.3.6
-      find-up: 2.1.0
+      eslint: 8.34.0
+      eslint-import-resolver-node: 0.3.7
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-import/2.26.0_m2kn7xiag5lymyarkgri27ztxm:
-    resolution: { integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== }
+  /eslint-plugin-import/2.27.5_srp5jszoagkj3pnpsesjjepemq:
+    resolution: { integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== }
     engines: { node: ">=4" }
     peerDependencies:
       "@typescript-eslint/parser": "*"
@@ -3837,20 +3862,22 @@ packages:
       "@typescript-eslint/parser":
         optional: true
     dependencies:
-      "@typescript-eslint/parser": 5.48.0_iukboom6ndih5an6iafl45j2fe
-      array-includes: 3.1.4
-      array.prototype.flat: 1.2.5
-      debug: 2.6.9
+      "@typescript-eslint/parser": 5.48.0_ehfyfk7qbmgzg5nk6xmobqdh3a
+      array-includes: 3.1.6
+      array.prototype.flat: 1.3.1
+      array.prototype.flatmap: 1.3.1
+      debug: 3.2.7
       doctrine: 2.1.0
-      eslint: 8.31.0
-      eslint-import-resolver-node: 0.3.6
-      eslint-module-utils: 2.7.3_j3yic7rgljchaotpxpgqdbhhna
+      eslint: 8.34.0
+      eslint-import-resolver-node: 0.3.7
+      eslint-module-utils: 2.7.4_7tt65c33h36wrjxv6iulwpakhy
       has: 1.0.3
-      is-core-module: 2.8.1
+      is-core-module: 2.11.0
       is-glob: 4.0.3
       minimatch: 3.1.2
-      object.values: 1.1.5
-      resolve: 1.22.0
+      object.values: 1.1.6
+      resolve: 1.22.1
+      semver: 6.3.0
       tsconfig-paths: 3.14.1
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
@@ -3858,6 +3885,34 @@ packages:
       - supports-color
     dev: true
 
+  /eslint-plugin-simple-import-sort/8.0.0_eslint@8.34.0:
+    resolution: { integrity: sha512-bXgJQ+lqhtQBCuWY/FUWdB27j4+lqcvXv5rUARkzbeWLwea+S5eBZEQrhnO+WgX3ZoJHVj0cn943iyXwByHHQw== }
+    peerDependencies:
+      eslint: ">=5.0.0"
+    dependencies:
+      eslint: 8.34.0
+    dev: true
+
+  /eslint-plugin-unused-imports/2.0.0_3p5c3yu7rnlwfc7nnagwrjhciu:
+    resolution: { integrity: sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A== }
+    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    peerDependencies:
+      "@typescript-eslint/eslint-plugin": ^5.0.0
+      eslint: ^8.0.0
+    peerDependenciesMeta:
+      "@typescript-eslint/eslint-plugin":
+        optional: true
+    dependencies:
+      "@typescript-eslint/eslint-plugin": 5.48.0_cviumkbgit4ykamswmghiujp3i
+      eslint: 8.34.0
+      eslint-rule-composer: 0.3.0
+    dev: true
+
+  /eslint-rule-composer/0.3.0:
+    resolution: { integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg== }
+    engines: { node: ">=4.0.0" }
+    dev: true
+
   /eslint-scope/5.1.1:
     resolution: { integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== }
     engines: { node: ">=8.0.0" }
@@ -3874,13 +3929,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.31.0:
+  /eslint-utils/3.0.0_eslint@8.34.0:
     resolution: { integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== }
     engines: { node: ^10.0.0 || ^12.0.0 || >= 14.0.0 }
     peerDependencies:
       eslint: ">=5"
     dependencies:
-      eslint: 8.31.0
+      eslint: 8.34.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -3894,8 +3949,8 @@ packages:
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     dev: true
 
-  /eslint/8.31.0:
-    resolution: { integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA== }
+  /eslint/8.34.0:
+    resolution: { integrity: sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg== }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     hasBin: true
     dependencies:
@@ -3910,7 +3965,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.31.0
+      eslint-utils: 3.0.0_eslint@8.34.0
       eslint-visitor-keys: 3.3.0
       espree: 9.4.1
       esquery: 1.4.0
@@ -4638,7 +4693,7 @@ packages:
   /has-property-descriptors/1.0.0:
     resolution: { integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== }
     dependencies:
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.3
     dev: true
 
   /has-symbols/1.0.3:
@@ -5019,6 +5074,12 @@ packages:
       ci-info: 2.0.0
     dev: true
 
+  /is-core-module/2.11.0:
+    resolution: { integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== }
+    dependencies:
+      has: 1.0.3
+    dev: true
+
   /is-core-module/2.8.1:
     resolution: { integrity: sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== }
     dependencies:
@@ -6804,13 +6865,13 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /object.values/1.1.5:
-    resolution: { integrity: sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== }
+  /object.values/1.1.6:
+    resolution: { integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== }
     engines: { node: ">= 0.4" }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.5
     dev: true
 
   /once/1.4.0:
@@ -7594,6 +7655,15 @@ packages:
       supports-preserve-symlinks-flag: 1.0.0
     dev: true
 
+  /resolve/1.22.1:
+    resolution: { integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== }
+    hasBin: true
+    dependencies:
+      is-core-module: 2.11.0
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: true
+
   /restore-cursor/3.1.0:
     resolution: { integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== }
     engines: { node: ">=8" }
@@ -7777,7 +7847,7 @@ packages:
     resolution: { integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== }
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.3
       object-inspect: 1.12.0
     dev: true
 
diff --git a/scripts/tools/cherry-pick.ts b/scripts/tools/cherry-pick.ts
index 25e27cc2..0c712ea1 100644
--- a/scripts/tools/cherry-pick.ts
+++ b/scripts/tools/cherry-pick.ts
@@ -37,7 +37,7 @@ const withDefaults = ({ cwd = ".", ...options }: Option, additionalDefaults: { c
   ...options,
 });
 
-const noop = () => {};
+const noop = () => undefined;
 
 const findFiles = async ({ cwd, inputDir }: { cwd: string; inputDir: string }) => {
   const filePaths = fs.readdirSync(path.join(cwd, inputDir)).filter(p => p.match(/\.(js|jsx|ts|tsx)/));
@@ -47,7 +47,7 @@ const findFiles = async ({ cwd, inputDir }: { cwd: string; inputDir: string }) =
 const pkgCache = new WeakMap();
 
 const getPkgName = async (options: Option) => {
-  if (options.name != null) {
+  if (options.name !== null) {
     return options.name;
   }
   if (pkgCache.has(options)) {
diff --git a/src/code-templates/api-client/ApiClientArgument.ts b/src/code-templates/class-api-client/ApiClientArgument.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientArgument.ts
rename to src/code-templates/class-api-client/ApiClientArgument.ts
diff --git a/src/code-templates/api-client/ApiClientClass/ApiClientInterface.ts b/src/code-templates/class-api-client/ApiClientClass/ApiClientInterface.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/ApiClientInterface.ts
rename to src/code-templates/class-api-client/ApiClientClass/ApiClientInterface.ts
diff --git a/src/code-templates/api-client/ApiClientClass/Class.ts b/src/code-templates/class-api-client/ApiClientClass/Class.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/Class.ts
rename to src/code-templates/class-api-client/ApiClientClass/Class.ts
diff --git a/src/code-templates/api-client/ApiClientClass/Constructor.ts b/src/code-templates/class-api-client/ApiClientClass/Constructor.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/Constructor.ts
rename to src/code-templates/class-api-client/ApiClientClass/Constructor.ts
diff --git a/src/code-templates/api-client/ApiClientClass/Method.ts b/src/code-templates/class-api-client/ApiClientClass/Method.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/Method.ts
rename to src/code-templates/class-api-client/ApiClientClass/Method.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/CallRequest.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/CallRequest.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/CallRequest.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/CallRequest.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/HeaderParameter.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/HeaderParameter.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/HeaderParameter.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/HeaderParameter.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/PathParameter.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/PathParameter.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/PathParameter.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/PathParameter.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/QueryParameter.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/QueryParameter.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/QueryParameter.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/QueryParameter.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/__tests__/PathParameter-test.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/__tests__/PathParameter-test.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/__tests__/PathParameter-test.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/__tests__/PathParameter-test.ts
diff --git a/src/code-templates/api-client/ApiClientClass/MethodBody/index.ts b/src/code-templates/class-api-client/ApiClientClass/MethodBody/index.ts
similarity index 97%
rename from src/code-templates/api-client/ApiClientClass/MethodBody/index.ts
rename to src/code-templates/class-api-client/ApiClientClass/MethodBody/index.ts
index f4b39085..31dcc796 100644
--- a/src/code-templates/api-client/ApiClientClass/MethodBody/index.ts
+++ b/src/code-templates/class-api-client/ApiClientClass/MethodBody/index.ts
@@ -79,5 +79,5 @@ export const create = (factory: TsGenerator.Factory.Type, params: CodeGenerator.
     }),
   );
 
-  return statements.length == 0 ? [factory.ReturnStatement.create({})] : statements;
+  return statements.length === 0 ? [factory.ReturnStatement.create({})] : statements;
 };
diff --git a/src/code-templates/api-client/ApiClientClass/index.ts b/src/code-templates/class-api-client/ApiClientClass/index.ts
similarity index 100%
rename from src/code-templates/api-client/ApiClientClass/index.ts
rename to src/code-templates/class-api-client/ApiClientClass/index.ts
diff --git a/src/code-templates/api-client/__tests__/utils.test.ts b/src/code-templates/class-api-client/__tests__/utils.test.ts
similarity index 100%
rename from src/code-templates/api-client/__tests__/utils.test.ts
rename to src/code-templates/class-api-client/__tests__/utils.test.ts
diff --git a/src/code-templates/api-client/index.ts b/src/code-templates/class-api-client/index.ts
similarity index 100%
rename from src/code-templates/api-client/index.ts
rename to src/code-templates/class-api-client/index.ts
diff --git a/src/code-templates/api-client/types.ts b/src/code-templates/class-api-client/types.ts
similarity index 100%
rename from src/code-templates/api-client/types.ts
rename to src/code-templates/class-api-client/types.ts
diff --git a/src/code-templates/api-client/utils.ts b/src/code-templates/class-api-client/utils.ts
similarity index 97%
rename from src/code-templates/api-client/utils.ts
rename to src/code-templates/class-api-client/utils.ts
index 9d0b2bf4..4c909a86 100644
--- a/src/code-templates/api-client/utils.ts
+++ b/src/code-templates/class-api-client/utils.ts
@@ -156,7 +156,7 @@ export const splitVariableText = (text: string): VariableElement[] => {
   // ["...."] にマッチする
   const pattern = '["[a-zA-Z_0-9.]+"]';
   // 'a.b.c["a"]["b"]'.split(/(\["[a-zA-Z_0-9\.]+"\])/g)
-  const splitTexts = text.split(/(\["[a-zA-Z_0-9\.]+"\])/g); // 区切り文字も含めて分割
+  const splitTexts = text.split(/(\["[a-zA-Z_0-9\\.]+"\])/g); // 区切り文字も含めて分割
   return splitTexts.reduce<VariableElement[]>((splitList, value) => {
     if (value === "") {
       return splitList;
@@ -164,7 +164,7 @@ export const splitVariableText = (text: string): VariableElement[] => {
     // ["book.name"] にマッチするか
     if (new RegExp(pattern).test(value)) {
       // ["book.name"] から book.name を抽出
-      const matchedValue = value.match(/[a-zA-Z_0-9\.]+/);
+      const matchedValue = value.match(/[a-zA-Z_0-9\\.]+/);
       if (matchedValue) {
         splitList.push({
           kind: "element-access",
diff --git a/src/internal/OpenApiTools/components/Reference.ts b/src/internal/OpenApiTools/components/Reference.ts
index b21c38b4..a446a788 100644
--- a/src/internal/OpenApiTools/components/Reference.ts
+++ b/src/internal/OpenApiTools/components/Reference.ts
@@ -143,7 +143,7 @@ export const generate = <T>(entryPoint: string, currentPoint: string, reference:
   } else {
     const relativePathFromEntryPoint = path.relative(path.dirname(entryPoint), referencePoint); // components/hoge/fuga.yml
     const pathArray: string[] = relativePathFromEntryPoint.split(path.sep); // ["components", "hoge", "fuga"]
-    if (pathArray[0] != "components") {
+    if (pathArray[0] !== "components") {
       throw new DevelopmentError(`targetPath is not start "components":\n${relativePathFromEntryPoint}`);
     }
 
diff --git a/src/internal/TsGenerator/factory/Namespace.ts b/src/internal/TsGenerator/factory/Namespace.ts
index 4e97d997..69e8a21e 100644
--- a/src/internal/TsGenerator/factory/Namespace.ts
+++ b/src/internal/TsGenerator/factory/Namespace.ts
@@ -34,7 +34,7 @@ export interface Factory {
 
 // eslint-disable-next-line no-unused-vars
 export const findStatement =
-  (context: Pick<ts.TransformationContext, "factory">): Factory["findNamespace"] =>
+  (_context: Pick<ts.TransformationContext, "factory">): Factory["findNamespace"] =>
   (params: Params$FindStatement): ts.Statement | undefined => {
     let statement: ts.Statement | undefined;
     params.node.forEachChild(node => {
diff --git a/src/meta.ts b/src/meta.ts
index ecb03efb..f2ea959d 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.19.3";
+export const Version = "0.21.0";
\ No newline at end of file
diff --git a/src/templates.ts b/src/templates.ts
index 65c4447e..426c7f91 100644
--- a/src/templates.ts
+++ b/src/templates.ts
@@ -1 +1 @@
-export * as ApiClient from "./code-templates/api-client";
+export * as ApiClient from "./code-templates/class-api-client";
diff --git a/test/__tests__/client-generate-test.ts b/test/__tests__/client-generate-test.ts
index 43521a68..27ed30fd 100644
--- a/test/__tests__/client-generate-test.ts
+++ b/test/__tests__/client-generate-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import { CodeGenerator } from "../../src";
 import * as Templates from "../../src/templates";
diff --git a/test/__tests__/multi-type.test.domain.ts b/test/__tests__/multi-type.test.domain.ts
index 6f448428..d5975698 100644
--- a/test/__tests__/multi-type.test.domain.ts
+++ b/test/__tests__/multi-type.test.domain.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";
 
diff --git a/test/__tests__/parameter-test.ts b/test/__tests__/parameter-test.ts
index 9f938eb9..b6f27ab7 100644
--- a/test/__tests__/parameter-test.ts
+++ b/test/__tests__/parameter-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";
 
diff --git a/test/__tests__/spit-code-test.ts b/test/__tests__/spit-code-test.ts
index bc359239..22376080 100644
--- a/test/__tests__/spit-code-test.ts
+++ b/test/__tests__/spit-code-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";
 
diff --git a/test/__tests__/template-only-test.ts b/test/__tests__/template-only-test.ts
index 72048299..4f98a7f6 100644
--- a/test/__tests__/template-only-test.ts
+++ b/test/__tests__/template-only-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";
 
diff --git a/test/__tests__/typedef-only-test.ts b/test/__tests__/typedef-only-test.ts
index 4d8f8e5c..a7d70579 100644
--- a/test/__tests__/typedef-only-test.ts
+++ b/test/__tests__/typedef-only-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";
 
diff --git a/test/__tests__/unknown-schema-domain-test.ts b/test/__tests__/unknown-schema-domain-test.ts
index 265f42f5..2ac4bc23 100644
--- a/test/__tests__/unknown-schema-domain-test.ts
+++ b/test/__tests__/unknown-schema-domain-test.ts
@@ -1,5 +1,4 @@
 import * as fs from "fs";
-import * as path from "path";
 
 import * as Utils from "../utils";