fix: do not use named imports from typescript module

Author: mrlubos

.changeset/tasty-candles-retire.md

@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: do not use named imports from typescript module

packages/openapi-ts/src/compiler/index.ts

@@ -10,7 +10,6 @@ import * as utils from './utils';
 export type { Property } from './typedef';
 export type { FunctionParameter } from './types';
 export type { Comments } from './utils';
-export type { ClassElement, Node, TypeNode } from 'typescript';
 
 export const compiler = {
   anonymousFunction: types.createAnonymousFunction,

packages/openapi-ts/src/generate/files.ts

@@ -1,9 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-import type ts from 'typescript';
-import type { ParsedCommandLine } from 'typescript';
-import { ModuleResolutionKind } from 'typescript';
+import ts from 'typescript';
 
 import { compiler } from '../compiler';
 import { type ImportExportItemObject, tsNodeToString } from '../compiler/utils';
@@ -285,14 +283,14 @@ export class TypeScriptFile {
     return [name, 'gen', extension].filter(Boolean).join('.');
   }
 
-  private _toString(separator: string, tsConfig: ParsedCommandLine | null) {
+  private _toString(separator: string, tsConfig: ts.ParsedCommandLine | null) {
     let output: Array<string> = [];
     if (this._headers.length) {
       output.push(this._headers.join('\n'));
     }
 
     const shouldAppendJs =
-      tsConfig?.options.moduleResolution === ModuleResolutionKind.NodeNext;
+      tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.NodeNext;
 
     const importsStringArray: Array<string> = [];
 
@@ -326,7 +324,7 @@ export class TypeScriptFile {
     return output.join(separator);
   }
 
-  public write(separator = '\n', tsConfig: ParsedCommandLine | null = null) {
+  public write(separator = '\n', tsConfig: ts.ParsedCommandLine | null = null) {
     if (this.isEmpty()) {
       this.remove({ force: true });
       return;

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

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { ModuleResolutionKind } from 'typescript';
+import ts from 'typescript';
 
 import { compiler } from '../compiler';
 import { parseIR } from '../ir/parser';
@@ -157,7 +157,7 @@ export const generateOutput = async ({ context }: { context: IR.Context }) => {
       findTsConfigPath(context.config.output.tsConfigPath),
     );
     const shouldAppendJs =
-      tsConfig?.options.moduleResolution === ModuleResolutionKind.NodeNext;
+      tsConfig?.options.moduleResolution === ts.ModuleResolutionKind.NodeNext;
 
     for (const file of Object.values(context.files)) {
       const fileName = file.nameWithoutExtension();

packages/openapi-ts/src/generate/tsConfig.ts

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import type { ParsedCommandLine } from 'typescript';
 import ts from 'typescript';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -41,7 +40,7 @@ export const findTsConfigPath = (
 
 export const loadTsConfig = (
   configPath: string | null,
-): ParsedCommandLine | null => {
+): ts.ParsedCommandLine | null => {
   if (!configPath) {
     return null;
   }

packages/openapi-ts/src/plugins/@hey-api/sdk/plugin-legacy.ts

@@ -1,9 +1,6 @@
-import type {
-  ClassElement,
-  Comments,
-  FunctionParameter,
-  Node,
-} from '../../../compiler';
+import type ts from 'typescript';
+
+import type { Comments, FunctionParameter } from '../../../compiler';
 import { compiler } from '../../../compiler';
 import type {
   FunctionTypeParameter,
@@ -36,7 +33,7 @@ import type { Plugin } from '../../types';
 import { getClientPlugin } from '../client-core/utils';
 import type { Config } from './types';
 
-type OnNode = (node: Node) => void;
+type OnNode = (node: ts.Node) => void;
 type OnImport = (name: string) => void;
 
 export const generateImport = ({
@@ -712,7 +709,7 @@ const processService = ({
     return;
   }
 
-  let members: ClassElement[] = service.operations.map((operation) => {
+  let members: ts.ClassElement[] = service.operations.map((operation) => {
     const node = compiler.methodDeclaration({
       accessLevel: 'public',
       comment: toOperationComment(operation),

packages/openapi-ts/src/plugins/@hey-api/typescript/plugin-legacy.ts

@@ -1,6 +1,6 @@
-import type { EnumDeclaration } from 'typescript';
+import type ts from 'typescript';
 
-import { type Comments, compiler, type Node } from '../../../compiler';
+import { type Comments, compiler } from '../../../compiler';
 import { TypeScriptFile } from '../../../generate/files';
 import { isOperationParameterRequired } from '../../../openApi';
 import type {
@@ -29,7 +29,7 @@ import type { Config } from './types';
 export interface TypesProps {
   client: Client;
   model: Model;
-  onNode: (node: Node) => void;
+  onNode: (node: ts.Node) => void;
   onRemoveNode?: VoidFunction;
 }
 
@@ -131,7 +131,7 @@ export const generateType = ({
 const processComposition = (props: TypesProps) => {
   const config = getConfig();
 
-  const enumDeclarations = [] as EnumDeclaration[];
+  const enumDeclarations = [] as ts.EnumDeclaration[];
 
   processType(props);
 
@@ -149,7 +149,7 @@ const processComposition = (props: TypesProps) => {
       ...props,
       model: enumerator,
       onNode: (node) => {
-        enumDeclarations.push(node as EnumDeclaration);
+        enumDeclarations.push(node as ts.EnumDeclaration);
       },
     });
   });

packages/openapi-ts/src/utils/type.ts

@@ -1,4 +1,6 @@
-import { compiler, type Property, type TypeNode } from '../compiler';
+import type ts from 'typescript';
+
+import { compiler, type Property } from '../compiler';
 import type { Model } from '../openApi';
 import { sanitizeOperationParameterName } from '../openApi';
 import type { Client } from '../types/client';
@@ -191,7 +193,7 @@ const typeInterface = (model: Model) => {
   });
 };
 
-export const toType = (model: Model): TypeNode => {
+export const toType = (model: Model): ts.TypeNode => {
   switch (model.export) {
     case 'all-of':
       return typeUnionOrIntersection({