typescript-axios: support TypeScript 6 (#25148)

* fix: include TypeScript 6 in typescript-axios devDependency range

Addresses #24830.

* test: cover TypeScript 6 in typescript-axios package template

Add a regression assertion for the generated TypeScript dependency range.

* fix(typescript-axios): avoid deprecated module resolution

Remove the explicit node10 moduleResolution override from generated ES6 tsconfig files. TypeScript 6 deprecates that setting; omitting it preserves the compiler default while keeping generated clients compatible.

* test(typescript-axios): cover TS6 tsconfig generation

Generate an ES6 client in the TypeScript 6 compatibility regression test and assert its tsconfig does not specify the deprecated node10 resolution option.

* Update TypeScript version range in package.json

* fix(samples): update TypeScript Axios outputs for TS 6

* fix(samples): update TypeScript Axios outputs for TS 6

Remove 'moduleResolution' option from tsconfig.json

* fix(samples): support TypeScript 6 in generated client

Update with-complex-headers generated package.json to match the TypeScript Axios template range.

* fix(samples): update separate-models TypeScript range

Update the with-npm-version-and-separate-models-and-api generated sample.

* fix(samples): update with-npm-version for TS 6

Update the with-npm-version generated sample to match the current TypeScript range.

Author: Felix-ming

modules/openapi-generator/src/main/resources/typescript-axios/package.mustache

@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   }{{#npmRepository}},{{/npmRepository}}
 {{#npmRepository}}
   "publishConfig": {

modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache

@@ -6,9 +6,6 @@
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
-    {{#supportsES6}}
-    "moduleResolution": "node",
-    {{/supportsES6}}
     {{^supportsES6}}
     "lib": [
       "es6",

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/axios/TypeScriptAxiosClientCodegenTest.java

@@ -280,4 +280,29 @@ public void generatesTrailingCommasInAsConstEnumObjects() throws Exception {
                         "    Xyz: '(xyz)',\n" +
                         "} as const;");
     }
+
+
+    @Test(description = "Generated package.json supports TypeScript 6")
+    public void testGeneratedPackageJsonSupportsTypeScript6() throws Exception {
+        final File output = Files.createTempDirectory("typescript_axios_typescript_6_").toFile();
+        output.deleteOnExit();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("typescript-axios")
+                .setInputSpec("src/test/resources/3_0/petstore.yaml")
+                .addAdditionalProperty("npmName", "@openapi/typescript-axios-petstore")
+                .addAdditionalProperty("snapshot", false)
+                .addAdditionalProperty("npmVersion", "1.0.0-SNAPSHOT")
+                .addAdditionalProperty("supportsES6", true)
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final List<File> files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate();
+        files.forEach(File::deleteOnExit);
+
+        TestUtils.assertFileContains(Paths.get(output + "/package.json"),
+                "\"typescript\": \"^4.0 || ^5.0 || ^6.0\"");
+        assertThat(Files.readString(Paths.get(output + "/tsconfig.json")))
+                .doesNotContain("\"moduleResolution\": \"node\"");
+
+    }
 }

samples/client/echo_api/typescript-axios/build/package.json

@@ -26,6 +26,6 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   }
 }

samples/client/petstore/typescript-axios/builds/es6-target/package.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"

samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json

@@ -6,7 +6,6 @@
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
-    "moduleResolution": "node",
     "typeRoots": [
       "node_modules/@types"
     ]

samples/client/petstore/typescript-axios/builds/with-complex-headers/package.json

@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"

samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/package.json

@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"

samples/client/petstore/typescript-axios/builds/with-npm-version/package.json

@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@types/node": "12.11.5 - 12.20.42",
-    "typescript": "^4.0 || ^5.0"
+    "typescript": "^4.0 || ^5.0 || ^6.0"
   },
   "publishConfig": {
     "registry": "https://skimdb.npmjs.com/registry"