Support TypeScript 6.0.x and hey-api/openapi-ts 0.99.x

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           cache: "pnpm"
 
       - name: Install dependencies

docs/src/content/docs/contributing.md

@@ -5,7 +5,7 @@ description: Contributing to OpenAPI React Query Codegen.
 
 ## Prerequisites
 
-- Node.js v20.16.0 or later
+- Node.js v24 or later
 - pnpm v9
 
 ## Install dependencies
@@ -45,3 +45,20 @@ npm run build && pnpm --filter @7nohe/react-app generate:api && pnpm --filter @7
 ```bash
 pnpm --filter docs dev
 ```
+
+## Type patches for dependencies
+
+This project compiles with `skipLibCheck: false`, so type errors inside dependency declaration files fail the build. Two mechanisms keep it green:
+
+- `patches/` contains [pnpm patches](https://pnpm.io/cli/patch) that insert `// @ts-ignore` comments over known typing bugs in the bundled declaration files of `@hey-api/openapi-ts` and `@hey-api/shared`. No implementation code is modified.
+- `src/vendor-typestubs.d.ts` stubs modules referenced by `@hey-api/openapi-ts` type declarations but not installed here (framework-specific client plugins such as `ky`, `ofetch`, `nuxt/app`, `@angular/*`).
+
+When upgrading `@hey-api/openapi-ts`, recreate the patches against the new version:
+
+```bash
+pnpm patch @hey-api/openapi-ts@<new-version>
+# edit the printed directory, then
+pnpm patch-commit <printed-directory>
+```
+
+Run `pnpm build` afterwards — any remaining declaration errors point to patches or stubs that need updating, and patches that no longer apply can be removed.

package.json

@@ -47,7 +47,7 @@
   "license": "MIT",
   "author": "Daiki Urata (@7nohe)",
   "dependencies": {
-    "@hey-api/openapi-ts": "0.92.3",
+    "@hey-api/openapi-ts": "0.99.0",
     "cross-spawn": "^7.0.3"
   },
   "devDependencies": {
@@ -59,23 +59,24 @@
     "commander": "^12.0.0",
     "lefthook": "^1.6.10",
     "rimraf": "^5.0.5",
-    "ts-morph": "^27.0.2",
-    "typescript": "^5.9.3",
+    "ts-morph": "^28.0.0",
+    "typescript": "^6.0.3",
     "vitest": "^1.5.0"
   },
   "peerDependencies": {
     "commander": "12.x",
-    "ts-morph": "27.x",
-    "typescript": "5.x"
+    "ts-morph": "28.x",
+    "typescript": "5.x || 6.x"
   },
   "packageManager": "pnpm@9.6.0",
   "engines": {
-    "node": ">=20.19.0",
+    "node": ">=22.18.0",
     "pnpm": ">=9"
   },
   "pnpm": {
     "patchedDependencies": {
-      "@hey-api/openapi-ts@0.92.3": "patches/@hey-api__openapi-ts@0.92.3.patch"
+      "@hey-api/openapi-ts@0.99.0": "patches/@hey-api__openapi-ts@0.99.0.patch",
+      "@hey-api/shared@0.5.0": "patches/@hey-api__shared@0.5.0.patch"
     }
   }
 }

patches/@hey-api__openapi-ts@0.99.0.patch

@@ -0,0 +1,20 @@
+diff --git a/dist/index.d.mts b/dist/index.d.mts
+index f2ca29144731f9320cea459d0e290352e2701e92..4255212e3846fee11fa9dd77a782d5ce1a2e00c9 100644
+--- a/dist/index.d.mts
++++ b/dist/index.d.mts
+@@ -1475,6 +1475,7 @@ declare class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends Mixed$31 {
+   decl(): FuncTsDsl<'decl'>;
+   /** Switches the function to a function expression form. */
+   expr(): FuncTsDsl<'expr'>;
++  // @ts-ignore TS2416 - bundled declaration has incorrect base type TsDsl<ArrowFunction>; conditional return is valid at source level
+   toAst(): M extends 'decl' ? ts.FunctionDeclaration : M extends 'expr' ? ts.FunctionExpression : ts.ArrowFunction;
+   $validate(): asserts this;
+   private missingRequiredCalls;
+@@ -1848,6 +1849,7 @@ declare class ImplForTsDsl<M extends ForMode = 'for'> extends Mixed$16 {
+   of(iterable?: ForIterable): ForTsDsl<'of'>;
+   /** Sets the update expression (e.g., `i++`). */
+   update(update: ForIterable): this;
++  // @ts-ignore TS2416 - bundled declaration has incorrect base type TsDsl<ForStatement>; conditional return is valid at source level
+   toAst(): M extends 'for' ? ts.ForStatement : M extends 'of' ? ts.ForOfStatement : ts.ForInStatement;
+   $validate(): asserts this is this & {
+     _iterableOrUpdate: ForIterable;

patches/@hey-api__shared@0.5.0.patch

@@ -0,0 +1,12 @@
+diff --git a/dist/index.d.mts b/dist/index.d.mts
+index d4f7acfd6f4b0a65b9de871e7bc88a6151c8a520..1fdc18bb747a9dfc56b74e3e69e1e9ce3275ca85 100644
+--- a/dist/index.d.mts
++++ b/dist/index.d.mts
+@@ -3190,6 +3190,7 @@ declare function definePluginConfig<T extends Plugin.Types>(pluginConfig: Plugin
+     plugin: PluginInstance<T>;
+   }) => void;
+   imports?: ((plugin: PluginInstance<T>) => T["imports"]) | undefined;
++  // @ts-ignore TS2749 - bundled declaration references value 'log' as a type; upstream typing bug
+   symbolMeta?: (symbol: Omit<log, "name">) => log;
+   tags?: ReadonlyArray<PluginTag>;
+ };