Merge pull request #3566 from hey-api/fix/deps-typescript

refactor: remove TypeScript from peer dependencies

Author: mrlubos

.changeset/common-results-kneel.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/codegen-core": patch
+---
+
+**internal**: remove TypeScript from peer dependencies

.changeset/fruity-adults-invite.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/shared": patch
+---
+
+**internal**: remove TypeScript from peer dependencies

.changeset/rude-games-poke.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/types": patch
+---
+
+**internal**: remove TypeScript from peer dependencies

packages/codegen-core/package.json

@@ -56,9 +56,6 @@
     "eslint": "9.39.1",
     "typescript": "5.9.3"
   },
-  "peerDependencies": {
-    "typescript": ">=5.5.3"
-  },
   "engines": {
     "node": ">=20.19.0"
   }

packages/openapi-python/package.json

@@ -73,9 +73,6 @@
     "typescript": "5.9.3",
     "yaml": "2.8.2"
   },
-  "peerDependencies": {
-    "typescript": ">=5.5.3"
-  },
   "engines": {
     "node": ">=20.19.0"
   }

packages/openapi-ts/package.json

@@ -75,7 +75,8 @@
     "@hey-api/types": "workspace:*",
     "ansi-colors": "4.1.3",
     "color-support": "1.1.3",
-    "commander": "14.0.3"
+    "commander": "14.0.3",
+    "get-tsconfig": "4.13.6"
   },
   "devDependencies": {
     "@angular/common": "21.1.2",

packages/openapi-ts/src/config/output/config.ts

@@ -3,9 +3,10 @@ import { fileURLToPath } from 'node:url';
 
 import { log } from '@hey-api/codegen-core';
 import type { PostProcessor, UserPostProcessor } from '@hey-api/shared';
-import { findTsConfigPath, loadTsConfig, resolveSource, valueToObject } from '@hey-api/shared';
+import { findTsConfigPath, resolveSource, valueToObject } from '@hey-api/shared';
 import type { MaybeArray } from '@hey-api/types';
-import ts from 'typescript';
+import type { TsConfigJsonResolved } from 'get-tsconfig';
+import { parseTsconfig } from 'get-tsconfig';
 
 import { postProcessors } from './postprocess';
 import type { Output, UserOutput } from './types';
@@ -64,10 +65,14 @@ export function getOutput(userConfig: { output: MaybeArray<string | UserOutput>
   output.tsConfig = loadTsConfig(findTsConfigPath(__dirname, output.tsConfigPath));
   if (
     output.importFileExtension === undefined &&
-    (output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.NodeNext ||
-      output.tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.Node16 ||
-      output.tsConfig?.options.module === ts.ModuleKind.NodeNext ||
-      output.tsConfig?.options.module === ts.ModuleKind.Node16)
+    (output.tsConfig?.compilerOptions?.moduleResolution === 'nodenext' ||
+      output.tsConfig?.compilerOptions?.moduleResolution === 'NodeNext' ||
+      output.tsConfig?.compilerOptions?.moduleResolution === 'node16' ||
+      output.tsConfig?.compilerOptions?.moduleResolution === 'Node16' ||
+      output.tsConfig?.compilerOptions?.module === 'nodenext' ||
+      output.tsConfig?.compilerOptions?.module === 'NodeNext' ||
+      output.tsConfig?.compilerOptions?.module === 'node16' ||
+      output.tsConfig?.compilerOptions?.module === 'Node16')
   ) {
     output.importFileExtension = '.js';
   }
@@ -134,3 +139,15 @@ function normalizePostProcess(input: UserOutput['postProcess']): ReadonlyArray<P
     };
   });
 }
+
+function loadTsConfig(configPath: string | null): TsConfigJsonResolved | null {
+  if (!configPath) {
+    return null;
+  }
+
+  try {
+    return parseTsconfig(configPath);
+  } catch {
+    throw new Error(`Couldn't read tsconfig from path: ${configPath}`);
+  }
+}

packages/openapi-ts/src/config/output/types.ts

@@ -1,6 +1,6 @@
 import type { BaseOutput, BaseUserOutput, UserPostProcessor } from '@hey-api/shared';
 import type { AnyString } from '@hey-api/types';
-import type ts from 'typescript';
+import type { TsConfigJsonResolved } from 'get-tsconfig';
 
 import type { Formatters, Linters, PostProcessorPreset } from './postprocess';
 
@@ -85,7 +85,7 @@ export type Output = BaseOutput & {
    * The parsed TypeScript configuration used to generate the output.
    * If no `tsconfig` file path was provided or found, this will be `null`.
    */
-  tsConfig: ts.ParsedCommandLine | null;
+  tsConfig: TsConfigJsonResolved | null;
   /**
    * Relative or absolute path to the tsconfig file we should use to
    * generate the output. If a path to tsconfig file is not provided, we

packages/shared/package.json

@@ -56,9 +56,6 @@
     "typescript": "5.9.3",
     "yaml": "2.8.2"
   },
-  "peerDependencies": {
-    "typescript": ">=5.5.3"
-  },
   "engines": {
     "node": ">=20.19.0"
   }

packages/shared/src/index.ts

@@ -117,7 +117,7 @@ export type {
   PluginContext,
   PluginNames,
 } from './plugins/types';
-export { findPackageJson, findTsConfigPath, loadPackageJson, loadTsConfig } from './tsConfig';
+export { findPackageJson, findTsConfigPath, loadPackageJson } from './tsConfig';
 export type { Logs } from './types/logs';
 export type { WatchValues } from './types/watch';
 export { escapeComment } from './utils/escape';